Merge remote-tracking branch 'spi/fix/pxa' into spi-linus
authorMark Brown <broonie@linaro.org>
Wed, 26 Jun 2013 15:20:54 +0000 (16:20 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 26 Jun 2013 15:20:54 +0000 (16:20 +0100)

Trivial merge