Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 26 Nov 2010 16:17:42 +0000 (17:17 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 26 Nov 2010 16:17:42 +0000 (17:17 +0100)

Trivial merge