Merge branch 'fix/asoc' into for-linus
Takashi Iwai [Sun, 15 Aug 2010 12:34:02 +0000 (14:34 +0200)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge