Merge remote-tracking branch 'spi/topic/topcliff' into spi-next
authorMark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 12:49:17 +0000 (13:49 +0100)
committerMark Brown <broonie@linaro.org>
Sun, 1 Sep 2013 12:49:17 +0000 (13:49 +0100)

Trivial merge