Merge remote-tracking branch 'spi/topic/core' into spi-next
authorMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 16:21:03 +0000 (17:21 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 16:21:03 +0000 (17:21 +0100)

Trivial merge