Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/sprd' and 'spi/topic...
authorMark Brown <broonie@kernel.org>
Mon, 2 Apr 2018 14:56:45 +0000 (15:56 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 2 Apr 2018 14:56:45 +0000 (15:56 +0100)

Trivial merge