Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <[email protected]>
Fri, 4 Feb 2011 16:08:53 +0000 (17:08 +0100)
committerTakashi Iwai <[email protected]>
Fri, 4 Feb 2011 16:08:53 +0000 (17:08 +0100)

Trivial merge