Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm2385', 'spi/topic...
authorMark Brown <broonie@kernel.org>
Sat, 11 Apr 2015 22:09:03 +0000 (23:09 +0100)
committerMark Brown <broonie@kernel.org>
Sat, 11 Apr 2015 22:09:03 +0000 (23:09 +0100)

Trivial merge