Merge remote-tracking branch 'spi/fix/core' into spi-linus
authorMark Brown <broonie@linaro.org>
Sun, 30 Mar 2014 00:50:53 +0000 (00:50 +0000)
committerMark Brown <broonie@linaro.org>
Sun, 30 Mar 2014 00:50:53 +0000 (00:50 +0000)

Trivial merge