Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 12 Jan 2010 16:50:06 +0000 (17:50 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 12 Jan 2010 16:50:06 +0000 (17:50 +0100)

Trivial merge