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

Trivial merge