Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 17 Aug 2010 10:35:10 +0000 (12:35 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 17 Aug 2010 10:35:10 +0000 (12:35 +0200)

Trivial merge