Merge branch 'master' into for_mm
[linux-2.6] / include / asm-ia64 / parport.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2