Merge by Hand
[linux-2.6] / sound / pci / emu10k1 / voice.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2