Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
authorMark Brown <broonie@linaro.org>
Thu, 12 Dec 2013 00:30:03 +0000 (00:30 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 12 Dec 2013 00:30:03 +0000 (00:30 +0000)

Trivial merge