Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sun, 15 Aug 2010 12:34:02 +0000 (14:34 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sun, 15 Aug 2010 12:34:02 +0000 (14:34 +0200)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge