Merge branch 'fix/asoc' into for-linus
Takashi Iwai [Fri, 27 May 2011 06:03:03 +0000 (08:03 +0200)]

Trivial merge