Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sat, 5 May 2012 09:27:26 +0000 (11:27 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 5 May 2012 09:27:26 +0000 (11:27 +0200)

Trivial merge