Merge remote-tracking branches 'spi/topic/omap-100k', 'spi/topic/omap-uwire', 'spi...
authorMark Brown <broonie@kernel.org>
Sat, 11 Apr 2015 22:09:18 +0000 (23:09 +0100)
committerMark Brown <broonie@kernel.org>
Sat, 11 Apr 2015 22:09:18 +0000 (23:09 +0100)

Trivial merge