Merge remote-tracking branch 'asoc/fix/core' into tmp

This commit is contained in:
Mark Brown 2013-01-22 16:26:15 +08:00
commit 05780d7771