Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sat, 9 Jul 2011 09:56:43 +0000 (11:56 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 9 Jul 2011 09:56:43 +0000 (11:56 +0200)

Trivial merge