Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 18 Dec 2009 13:19:29 +0000 (14:19 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 18 Dec 2009 13:19:29 +0000 (14:19 +0100)

Trivial merge