Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 15 Dec 2011 11:56:04 +0000 (12:56 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 15 Dec 2011 11:56:04 +0000 (12:56 +0100)

Trivial merge