Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <[email protected]>
Sun, 20 Jun 2010 08:38:14 +0000 (10:38 +0200)
committerTakashi Iwai <[email protected]>
Sun, 20 Jun 2010 08:38:14 +0000 (10:38 +0200)

Trivial merge