Merge remote-tracking branches 'spi/topic/omap-uwire', 'spi/topic/omap100k', 'spi...
authorMark Brown <broonie@linaro.org>
Sun, 30 Mar 2014 00:51:27 +0000 (00:51 +0000)
committerMark Brown <broonie@linaro.org>
Sun, 30 Mar 2014 00:51:27 +0000 (00:51 +0000)

Trivial merge