Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <[email protected]>
Sun, 13 Feb 2011 09:05:30 +0000 (10:05 +0100)
committerTakashi Iwai <[email protected]>
Sun, 13 Feb 2011 09:05:30 +0000 (10:05 +0100)

Trivial merge