Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux...
[linux-2.6] / include / asm-um / ide.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2