Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next
authorMark Brown <broonie@linaro.org>
Thu, 24 Oct 2013 10:24:02 +0000 (11:24 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 24 Oct 2013 10:24:02 +0000 (11:24 +0100)

Trivial merge