Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 27 May 2011 06:03:03 +0000 (08:03 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 27 May 2011 06:03:03 +0000 (08:03 +0200)

Trivial merge