Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <[email protected]>
Wed, 18 Aug 2010 13:22:18 +0000 (15:22 +0200)
committerTakashi Iwai <[email protected]>
Wed, 18 Aug 2010 13:22:18 +0000 (15:22 +0200)

Trivial merge