Merge branch 'linux-2.6'
[linux-drm-fsl-dcu.git] / include / asm-alpha / parport.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2