Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 19 Dec 2008 14:37:12 +0000 (15:37 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 19 Dec 2008 14:37:12 +0000 (15:37 +0100)

Trivial merge