Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 9 Nov 2011 07:52:22 +0000 (08:52 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 9 Nov 2011 07:52:22 +0000 (08:52 +0100)

Trivial merge