Merge branch 'topic/aoa' into to-push
[safe/jmp/linux-2.6] / sound / aoa / codecs / tas.h