Merge branches 'oprofile-v2' and 'timers/hpet' into x86/core-v4
[linux-2.6] / drivers / parport / multiface.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2