Merge with /pub/scm/linux/kernel/git/sfrench/cifs-2.6.git/
[linux-2.6-microblaze.git] / sound / parisc / Kconfig
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2