Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 3 Nov 2010 14:51:26 +0000 (15:51 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 3 Nov 2010 14:51:26 +0000 (15:51 +0100)

Trivial merge