Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace
[linux-2.6] / sound / oss / midi_ctrl.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2