Merge remote-tracking branches 'spi/topic/adi', 'spi/topic/atmel' and 'spi/topic...
authorMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:35 +0000 (17:08 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:35 +0000 (17:08 +0100)

Trivial merge