Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 24 Jun 2011 10:36:25 +0000 (12:36 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 24 Jun 2011 10:36:25 +0000 (12:36 +0200)

Trivial merge