Merge branch 'linus' into x86/threadinfo
[linux-2.6] / arch / h8300 / Kconfig.ide
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2