Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 23 Sep 2011 13:26:37 +0000 (15:26 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 23 Sep 2011 13:26:37 +0000 (15:26 +0200)

Trivial merge