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

Trivial merge