Merge remote-tracking branch 'spi/fix/mcspi' into spi-linus
authorMark Brown <broonie@linaro.org>
Fri, 25 Oct 2013 08:51:19 +0000 (09:51 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 25 Oct 2013 08:51:19 +0000 (09:51 +0100)

Trivial merge