Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sat, 9 Apr 2011 08:05:30 +0000 (10:05 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 9 Apr 2011 08:05:30 +0000 (10:05 +0200)

Trivial merge