Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 24 Nov 2010 13:19:17 +0000 (14:19 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 24 Nov 2010 13:19:17 +0000 (14:19 +0100)

Trivial merge