Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <[email protected]>
Fri, 26 Aug 2011 07:29:43 +0000 (09:29 +0200)
committerTakashi Iwai <[email protected]>
Fri, 26 Aug 2011 07:29:43 +0000 (09:29 +0200)

Trivial merge