Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x
authorMark Brown <broonie@linaro.org>
Thu, 3 Oct 2013 16:25:40 +0000 (17:25 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 3 Oct 2013 16:25:40 +0000 (17:25 +0100)
Conflicts:
drivers/spi/spi-clps711x.c


Trivial merge