Merge from Linus' tree
[linux-2.6] / sound / core / seq / instr / ainstr_simple.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2