Merge remote-tracking branches 'spi/fix/qup' and 'spi/fix/topcliff-pch' into spi...
authorMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:31 +0000 (17:08 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:31 +0000 (17:08 +0100)

Trivial merge