Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 24 Mar 2010 07:03:34 +0000 (08:03 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 24 Mar 2010 07:03:34 +0000 (08:03 +0100)

Trivial merge