Merge remote-tracking branches 'spi/topic/sirf', 'spi/topic/spidev' and 'spi/topic...
authorMark Brown <broonie@kernel.org>
Wed, 17 Jun 2015 23:19:56 +0000 (00:19 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 17 Jun 2015 23:19:56 +0000 (00:19 +0100)

Trivial merge