Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 21 Dec 2009 11:05:37 +0000 (12:05 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 21 Dec 2009 11:05:37 +0000 (12:05 +0100)

Trivial merge