Merge branch 'linus' into x86/xen
[linux-2.6] / include / asm-parisc / parport.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2