Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sun, 31 Jan 2010 13:41:05 +0000 (14:41 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sun, 31 Jan 2010 13:41:05 +0000 (14:41 +0100)

Trivial merge