Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 1 Dec 2011 15:32:18 +0000 (16:32 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 1 Dec 2011 15:32:18 +0000 (16:32 +0100)

Trivial merge