Merge remote branch 'takashi/fix/asoc' into for-2.6.37

This commit is contained in:
Mark Brown 2010-11-03 12:32:54 -04:00
commit d6e116ba1e
2 changed files with 29 additions and 13 deletions