Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 28 Mar 2011 11:04:22 +0000 (13:04 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 28 Mar 2011 11:04:22 +0000 (13:04 +0200)

Trivial merge