Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 16 Apr 2010 08:02:48 +0000 (10:02 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 16 Apr 2010 08:02:48 +0000 (10:02 +0200)

Trivial merge