Merge remote-tracking branches 'asoc/topic/rl6231', 'asoc/topic/rockchip', 'asoc...
authorMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:31:55 +0000 (16:31 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:31:55 +0000 (16:31 +0100)

Trivial merge