Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 2 Nov 2010 15:04:53 +0000 (16:04 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 2 Nov 2010 15:04:53 +0000 (16:04 +0100)

Trivial merge