Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 23 Jan 2009 17:14:25 +0000 (18:14 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 23 Jan 2009 17:14:25 +0000 (18:14 +0100)

Trivial merge