Merge branch 'fix/asoc' into for-linus
Takashi Iwai [Tue, 15 Dec 2009 09:30:34 +0000 (10:30 +0100)]

Trivial merge