Merge branch 'pxa-ssp' into for-2.6.30
[safe/jmp/linux-2.6] / sound / oss / midi_ctrl.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2