Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 18 Mar 2010 16:40:26 +0000 (17:40 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 18 Mar 2010 16:40:26 +0000 (17:40 +0100)

Trivial merge