Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <[email protected]>
Sun, 2 Jan 2011 10:01:55 +0000 (11:01 +0100)
committerTakashi Iwai <[email protected]>
Sun, 2 Jan 2011 10:01:55 +0000 (11:01 +0100)

Trivial merge