Merge remote-tracking branch 'spi/fix/xilinx' into spi-linus
authorMark Brown <broonie@linaro.org>
Tue, 4 Jun 2013 17:52:05 +0000 (18:52 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 4 Jun 2013 17:52:05 +0000 (18:52 +0100)

Trivial merge