Merge branch 'topic/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 9 Dec 2009 17:16:15 +0000 (18:16 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 9 Dec 2009 17:16:15 +0000 (18:16 +0100)

Trivial merge