Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[linux-2.6] / sound / oss / trident.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2