Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 27 Sep 2011 16:21:41 +0000 (18:21 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 27 Sep 2011 16:21:41 +0000 (18:21 +0200)

Trivial merge