Merge commit 'kumar/kumar-next'
[linux-2.6] / include / media / audiochip.h