Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 14 Sep 2011 17:11:13 +0000 (19:11 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 14 Sep 2011 17:11:13 +0000 (19:11 +0200)

Trivial merge