Merge branch 'topic/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 17 Oct 2008 15:24:23 +0000 (17:24 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 17 Oct 2008 15:24:23 +0000 (17:24 +0200)

Trivial merge