Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 26 Jan 2011 13:38:46 +0000 (14:38 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 26 Jan 2011 13:38:46 +0000 (14:38 +0100)

Trivial merge