Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 2 Aug 2011 08:08:54 +0000 (10:08 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 2 Aug 2011 08:08:54 +0000 (10:08 +0200)

Trivial merge