Merge remote-tracking branches 'spi/topic/orion', 'spi/topic/pxa2xx', 'spi/topic...
authorMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:21:10 +0000 (16:21 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:21:10 +0000 (16:21 +0100)

Trivial merge