Merge branch 'master' of ../mmc
[pandora-kernel.git] / drivers / parport / multiface.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2