Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 2 Jun 2010 12:18:13 +0000 (14:18 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 2 Jun 2010 12:18:13 +0000 (14:18 +0200)

Trivial merge