Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 3 Nov 2011 17:20:53 +0000 (18:20 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 3 Nov 2011 17:20:53 +0000 (18:20 +0100)

Trivial merge