Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 22 Sep 2010 18:48:15 +0000 (20:48 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 22 Sep 2010 18:48:15 +0000 (20:48 +0200)

Trivial merge