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)
commitf9de73426c69ec3357c31a10af5f5acb037dbbaa
treeb4fa15ca5962c3cc7546c61b4c98c79a08662478
parent19655dd083290c371cbb5279839314a6927d9082
parentea467326e36b496a92c677cbbed1dfd03b707aaf
parentb716c4ffc6a2b0bfbcf9619880f335be11b65708
parent704f32d48af221fd6d6ffcafe679f04ddcf5e7f6
parentb3e7766bc459af941c311a3cb03f2082b2fe60ba
parent232a5adc5199891efde6c844fd15b8d4d18245e6
Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm2385', 'spi/topic/bcm2835', 'spi/topic/bcm53xx' and 'spi/topic/bitbang' into spi-next
drivers/spi/spi-atmel.c
drivers/spi/spi-bcm53xx.c
drivers/spi/spi.c
include/linux/spi/spi.h