Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
[pandora-kernel.git] / sound / oss / midi_ctrl.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2