Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sg', 'spi/topic/sh...
authorMark Brown <broonie@kernel.org>
Mon, 31 Aug 2015 13:45:41 +0000 (14:45 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 31 Aug 2015 13:45:41 +0000 (14:45 +0100)

Trivial merge