Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 22 Nov 2010 12:13:48 +0000 (13:13 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 22 Nov 2010 12:13:48 +0000 (13:13 +0100)

Trivial merge