Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 4 Feb 2011 16:08:53 +0000 (17:08 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 4 Feb 2011 16:08:53 +0000 (17:08 +0100)

Trivial merge