Merge remote-tracking branches 'spi/fix/pxa2xx' and 'spi/fix/qup' into spi-linus
authorMark Brown <broonie@linaro.org>
Tue, 13 May 2014 18:08:34 +0000 (19:08 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 13 May 2014 18:08:34 +0000 (19:08 +0100)

Trivial merge