Merge branch 'topic/pcsp-fix' into topic/misc
[linux-2.6] / drivers / parport / multiface.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2