From: Mark Brown <broonie@linaro.org>
Date: Sun, 30 Mar 2014 00:51:10 +0000 (+0000)
Subject: Merge remote-tracking branches 'spi/topic/drivers', 'spi/topic/dw', 'spi/topic/efm32... 
X-Git-Tag: v3.15-rc1~147^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3bcbc14911b82c245dc43dd02fbf85725b620e6c;p=linux.git

Merge remote-tracking branches 'spi/topic/drivers', 'spi/topic/dw', 'spi/topic/efm32', 'spi/topic/ep93xx', 'spi/topic/fsl', 'spi/topic/fsl-dspi', 'spi/topic/fsl-espi' and 'spi/topic/gpio' into spi-next
---

3bcbc14911b82c245dc43dd02fbf85725b620e6c
diff --cc drivers/spi/spi-efm32.c
index f53bbea385c0,d4d3cc534792,d4d3cc534792,4a5a359dafca,d4d3cc534792,d4d3cc534792,d4d3cc534792,d4d3cc534792,d4d3cc534792..be44a3eeb5e8
--- a/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)