Merge branch 'master' into for-linus
[linux-2.6.git] / include / asm-generic / ide_iops.h
2005-04-16 Linus Torvalds Linux-2.6.12-rc2