Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
authorMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:23 +0000 (17:20 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:23 +0000 (17:20 +0100)

Trivial merge