Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <[email protected]>
Wed, 24 Mar 2010 07:03:34 +0000 (08:03 +0100)
committerTakashi Iwai <[email protected]>
Wed, 24 Mar 2010 07:03:34 +0000 (08:03 +0100)

Trivial merge