Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sat, 25 Sep 2010 15:57:49 +0000 (17:57 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 25 Sep 2010 15:57:49 +0000 (17:57 +0200)

Trivial merge