Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 18 Jan 2011 13:05:44 +0000 (14:05 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 18 Jan 2011 13:05:44 +0000 (14:05 +0100)

Trivial merge