Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 15 Jun 2010 13:03:37 +0000 (15:03 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 15 Jun 2010 13:03:37 +0000 (15:03 +0200)

Trivial merge