Merge remote-tracking branches 'spi/topic/drivers', 'spi/topic/dw', 'spi/topic/efm32...

diff --cc drivers/spi/Kconfig
Simple merge

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

diff --cc drivers/spi/spi-efm32.c
index f53bbea,d4d3cc5,d4d3cc5,4a5a359,d4d3cc5,d4d3cc5,d4d3cc5,d4d3cc5,d4d3cc5..be44a3e
--- 1/drivers/spi/spi-efm32.c
--- 2/drivers/spi/spi-efm32.c
--- 3/drivers/spi/spi-efm32.c
--- 4/drivers/spi/spi-efm32.c
--- 5/drivers/spi/spi-efm32.c
--- 6/drivers/spi/spi-efm32.c
--- 7/drivers/spi/spi-efm32.c
--- 8/drivers/spi/spi-efm32.c
--- 9/drivers/spi/spi-efm32.c
+++ b/drivers/spi/spi-efm32.c
@@@@@@@@@@ -308,7 -308,11 -308,11 -308,6 -308,11 -308,11 -308,11 -308,11 -308,11 +308,6 @@@@@@@@@@ static void efm32_spi_probe_dt(struct p
                }
         
                ddata->pdata.location = location;
 -- -----
 -- -----       /* spi core takes care about the bus number using an alias */
 -- -----       master->bus_num = -1;
 -- -----
--- -----       return 0;
         }
         
         static int efm32_spi_probe(struct platform_device *pdev)

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

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