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

Trivial merge