Merge branch 'linus' into sched/urgent
[linux-2.6] / include / media / audiochip.h