Merge by hand (conflicts between pending drivers and kfree cleanups)
[linux-2.6] / include / asm-mips / ide.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2