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

This commit is contained in:
Mark Brown 2014-06-16 16:05:15 +01:00
commit 1f84acd2dc