Merge with rsync://fileserver/linux
[sfrench/cifs-2.6.git] / sound / oss / midi_synth.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2