Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/bcm2835', 'spi/fix/doc'...
authorMark Brown <broonie@kernel.org>
Tue, 22 Sep 2015 16:48:34 +0000 (09:48 -0700)
committerMark Brown <broonie@kernel.org>
Tue, 22 Sep 2015 16:48:34 +0000 (09:48 -0700)

Trivial merge