Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / sound / pci / ctxfi / ctamixer.h
2009-05-14 Wai Yew CHAYALSA: SB X-Fi driver merge