Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 6 Jun 2011 07:28:49 +0000 (09:28 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 6 Jun 2011 07:28:49 +0000 (09:28 +0200)

Trivial merge