Merge remote-tracking branch 'spi/fix/clps711x' into spi-linus
authorMark Brown <broonie@linaro.org>
Mon, 7 Oct 2013 13:51:56 +0000 (14:51 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 7 Oct 2013 13:51:56 +0000 (14:51 +0100)

Trivial merge