Merge remote-tracking branch 'spi/fix/pxa' into spi-linus
authorMark Brown <broonie@linaro.org>
Mon, 24 Jun 2013 11:28:28 +0000 (12:28 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 24 Jun 2013 11:28:28 +0000 (12:28 +0100)

Trivial merge