Merge remote-tracking branches 'spi/topic/armada', 'spi/topic/ath79', 'spi/topic...

diff --cc drivers/spi/Kconfig
Simple merge

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