Merge changes from linux-2.6 by hand
[linux-2.6-microblaze.git] / drivers / media / Kconfig
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2