Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 5 Apr 2011 07:14:04 +0000 (09:14 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 5 Apr 2011 07:14:04 +0000 (09:14 +0200)

Trivial merge