Merge branch 'topic/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 8 Mar 2010 08:35:48 +0000 (09:35 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 8 Mar 2010 08:35:48 +0000 (09:35 +0100)

Trivial merge