Merge remote-tracking branches 'spi/topic/imx', 'spi/topic/init', 'spi/topic/mpc512x...

diff --cc drivers/spi/Kconfig
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc drivers/spi/spi-mpc52xx.c
index e3d29a56d70a703a0e65f7a5694912cdb2858653,7c675fe8310105d255f6f10afc7a2f1c5e576b32,f573c3c099683bd0be8f263985e9c5f840034cd8,7c675fe8310105d255f6f10afc7a2f1c5e576b32,95bd2ffb0572bde0745f2c68532f9ccf6782e656,7c675fe8310105d255f6f10afc7a2f1c5e576b32,7c675fe8310105d255f6f10afc7a2f1c5e576b32,7c675fe8310105d255f6f10afc7a2f1c5e576b32,7c675fe8310105d255f6f10afc7a2f1c5e576b32..aac2a5ddd964efcf1086263fa1231235aa065141
--- 1/drivers/spi/spi-mpc52xx.c
--- 2/drivers/spi/spi-mpc52xx.c
--- 3/drivers/spi/spi-mpc52xx.c
--- 4/drivers/spi/spi-mpc52xx.c
--- 5/drivers/spi/spi-mpc52xx.c
--- 6/drivers/spi/spi-mpc52xx.c
--- 7/drivers/spi/spi-mpc52xx.c
--- 8/drivers/spi/spi-mpc52xx.c
--- 9/drivers/spi/spi-mpc52xx.c
+++ b/drivers/spi/spi-mpc52xx.c
@@@@@@@@@@ -357,17 -357,20 -356,20 -357,20 -357,6 -357,20 -357,20 -357,20 -357,20 +356,6 @@@@@@@@@@ static void mpc52xx_spi_wq(struct work_
          * spi_master ops
          */
         
---- ----static int mpc52xx_spi_setup(struct spi_device *spi)
---- ----{
---- ----       if (spi->bits_per_word % 8)
---- ----               return -EINVAL;
---- ----
---- ----       if (spi->mode & ~(SPI_CPOL | SPI_CPHA | SPI_LSB_FIRST))
 --- ----               return -EINVAL;
 --- ----
 --- ----       if (spi->chip_select >= spi->master->num_chipselect)
---- ----               return -EINVAL;
---- ----
---- ----       return 0;
---- ----}
---- ----
         static int mpc52xx_spi_transfer(struct spi_device *spi, struct spi_message *m)
         {
                struct mpc52xx_spi *ms = spi_master_get_devdata(spi->master);

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

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

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

diff --cc drivers/spi/spi-octeon.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