Merge remote-tracking branches 'spi/topic/bus-num', 'spi/topic/cleanup', 'spi/topic...

diff --cc drivers/spi/Kconfig
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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