Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 7 Apr 2010 07:54:41 +0000 (09:54 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 7 Apr 2010 07:54:41 +0000 (09:54 +0200)

Trivial merge