Merge remote-tracking branches 'spi/topic/acpi', 'spi/topic/axi-engine', 'spi/topic...

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/spi-bcm2835aux.c
Simple merge

diff --cc drivers/spi/spi.c
Simple merge

diff --cc include/linux/spi/spi.h
Simple merge