Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 2 Dec 2010 16:33:53 +0000 (17:33 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 2 Dec 2010 16:33:53 +0000 (17:33 +0100)

Trivial merge