Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git] / include / asm-h8300 / ide.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2