Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <[email protected]>
Tue, 6 Dec 2011 12:22:28 +0000 (13:22 +0100)
committerTakashi Iwai <[email protected]>
Tue, 6 Dec 2011 12:22:28 +0000 (13:22 +0100)

Trivial merge