Merge branch 'topic/asoc' into for-linus
authorTakashi Iwai <[email protected]>
Fri, 22 Jul 2011 06:43:19 +0000 (08:43 +0200)
committerTakashi Iwai <[email protected]>
Fri, 22 Jul 2011 06:43:19 +0000 (08:43 +0200)

Trivial merge