Merge remote-tracking branches 'spi/fix/pxa2xx', 'spi/fix/qup' and 'spi/fix/sh-sci...
authorMark Brown <broonie@linaro.org>
Sat, 28 Jun 2014 13:01:23 +0000 (14:01 +0100)
committerMark Brown <broonie@linaro.org>
Sat, 28 Jun 2014 13:01:23 +0000 (14:01 +0100)

Trivial merge