Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 8 Dec 2010 15:15:01 +0000 (16:15 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 8 Dec 2010 15:15:01 +0000 (16:15 +0100)

Trivial merge