Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm2835-code', 'spi/fix...
authorMark Brown <broonie@kernel.org>
Fri, 24 Apr 2015 10:10:46 +0000 (11:10 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 24 Apr 2015 10:10:46 +0000 (11:10 +0100)

Trivial merge