Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 25 Feb 2011 11:58:50 +0000 (12:58 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 25 Feb 2011 11:58:50 +0000 (12:58 +0100)

Trivial merge