Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sat, 28 Aug 2010 19:44:15 +0000 (21:44 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 28 Aug 2010 19:44:15 +0000 (21:44 +0200)

Trivial merge