Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 26 Jul 2011 15:47:05 +0000 (17:47 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 26 Jul 2011 15:47:05 +0000 (17:47 +0200)

Trivial merge