Merge remote-tracking branch 'spi/topic/sunxi' into spi-next
authorMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 16:48:29 +0000 (16:48 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 16:48:29 +0000 (16:48 +0000)

Trivial merge