Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 18 Jan 2011 13:06:01 +0000 (14:06 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 18 Jan 2011 13:06:01 +0000 (14:06 +0100)

Trivial merge