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

Trivial merge