Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 10 Jun 2011 15:49:34 +0000 (17:49 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 10 Jun 2011 15:49:34 +0000 (17:49 +0200)

Trivial merge