Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 26 Oct 2010 19:29:43 +0000 (21:29 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 26 Oct 2010 19:29:43 +0000 (21:29 +0200)

Trivial merge