Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 23 Nov 2010 11:41:17 +0000 (12:41 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 23 Nov 2010 11:41:17 +0000 (12:41 +0100)

Trivial merge