Merge by hand (conflicts in sr.c)
[powerpc.git] / drivers / isdn / icn / Kconfig
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2