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

Trivial merge