Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sat, 29 May 2010 19:50:27 +0000 (21:50 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 29 May 2010 19:50:27 +0000 (21:50 +0200)

Trivial merge