Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <[email protected]>
Wed, 14 Sep 2011 17:11:13 +0000 (19:11 +0200)
committerTakashi Iwai <[email protected]>
Wed, 14 Sep 2011 17:11:13 +0000 (19:11 +0200)

Trivial merge