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)
commit2b2322d662237a4b635a755df15e21b9ff80716b
treed7ecd68f0158835dabcf650c40dfe3370d91ec98
parentc70837908dc1b63298125e1b80064c4639d92fd2
parent0158026ccced1ae312233a6a46dc0b6edce3fb6c
Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x

Conflicts:
drivers/spi/spi-clps711x.c
drivers/spi/spi-clps711x.c