Merge remote-tracking branch 'spi/topic/core' into spi-next
authorMark Brown <broonie@kernel.org>
Mon, 31 Aug 2015 13:45:27 +0000 (14:45 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 31 Aug 2015 13:45:27 +0000 (14:45 +0100)

Trivial merge