Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 1 Apr 2011 16:02:23 +0000 (18:02 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 1 Apr 2011 16:02:23 +0000 (18:02 +0200)

Trivial merge