Merge master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6.git] / drivers / parport / multiface.h
2005-04-16 Linus Torvalds Linux-2.6.12-rc2