Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 5 Feb 2010 18:57:16 +0000 (19:57 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 5 Feb 2010 18:57:16 +0000 (19:57 +0100)

Trivial merge