Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 21 Jan 2011 07:10:14 +0000 (08:10 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 21 Jan 2011 07:10:14 +0000 (08:10 +0100)

Trivial merge