Merge branch 'topic/ctxfi-fix' into topic/ctxfi
[linux-2.6] / sound / pci / ctxfi / cthw20k2.h
2009-05-14  Wai Yew CHAYALSA: SB X-Fi driver merge