Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <[email protected]>
Sat, 26 Feb 2011 10:27:47 +0000 (11:27 +0100)
committerTakashi Iwai <[email protected]>
Sat, 26 Feb 2011 10:27:47 +0000 (11:27 +0100)

Trivial merge