Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 8 Aug 2011 12:30:44 +0000 (14:30 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 8 Aug 2011 12:30:44 +0000 (14:30 +0200)

Trivial merge