Merge branch 'asoc-fixes' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 2 Oct 2008 10:50:50 +0000 (12:50 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 2 Oct 2008 10:50:50 +0000 (12:50 +0200)

Trivial merge