Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 2 Nov 2009 15:18:29 +0000 (16:18 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 2 Nov 2009 15:18:29 +0000 (16:18 +0100)

Trivial merge