Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 12 Aug 2011 16:26:38 +0000 (18:26 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 12 Aug 2011 16:26:38 +0000 (18:26 +0200)

Trivial merge