Merge remote-tracking branch 'spi/topic/zynqmp' into spi-next
authorMark Brown <broonie@kernel.org>
Mon, 23 May 2016 11:16:58 +0000 (12:16 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 23 May 2016 11:16:58 +0000 (12:16 +0100)

Trivial merge