Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
authorMark Brown <broonie@linaro.org>
Fri, 27 Sep 2013 13:56:22 +0000 (14:56 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 27 Sep 2013 13:56:22 +0000 (14:56 +0100)

Trivial merge