Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
authorMark Brown <broonie@linaro.org>
Mon, 16 Jun 2014 15:05:15 +0000 (16:05 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 16 Jun 2014 15:05:15 +0000 (16:05 +0100)

Trivial merge