Merge remote-tracking branch 'spi/fix/setup' into spi-linus
authorMark Brown <broonie@linaro.org>
Mon, 15 Jul 2013 10:46:15 +0000 (11:46 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 15 Jul 2013 10:46:15 +0000 (11:46 +0100)

Trivial merge