Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 5 Feb 2010 17:38:38 +0000 (18:38 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 5 Feb 2010 17:38:38 +0000 (18:38 +0100)

Trivial merge