Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Aug 2010 13:09:52 +0000 (15:09 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Aug 2010 13:09:52 +0000 (15:09 +0200)

Trivial merge