Merge branch 'topic/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 4 Dec 2009 15:22:41 +0000 (16:22 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 4 Dec 2009 15:22:41 +0000 (16:22 +0100)

Trivial merge