Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <[email protected]>
Wed, 23 Nov 2011 16:07:16 +0000 (17:07 +0100)
committerTakashi Iwai <[email protected]>
Wed, 23 Nov 2011 16:07:16 +0000 (17:07 +0100)

Trivial merge