Merge branches 'pxa' and 'orion-fixes1'
[linux-2.6] / drivers / isdn / capi / Makefile
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2