next-20131224/spi

Conflicts:
	drivers/spi/spi-mpc512x-psc.c

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/spi-mpc512x-psc.c
index 2babea28b310af7071b1ca091833cc27809c9139,46d2313f7c6fc1e155ff15c7f60962291c923524..5032141eeeec4ee0cbb46b7d7af7c8a65e76212c
--- 1/drivers/spi/spi-mpc512x-psc.c
--- 2/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@@ -519,10 -519,12 +518,10 @@@ static int mpc512x_psc_spi_do_probe(str
                goto free_master;
        init_completion(&mps->txisrdone);
  
 -      psc_num = master->bus_num;
 -      snprintf(clk_name, sizeof(clk_name), "psc%d_mclk", psc_num);
 -      clk = devm_clk_get(dev, clk_name);
 +      clk = devm_clk_get(dev, "mclk");
        if (IS_ERR(clk)) {
                ret = PTR_ERR(clk);
-               goto free_irq;
+               goto free_master;
        }
        ret = clk_prepare_enable(clk);
        if (ret)
@@@ -550,15 -542,9 +549,11 @@@
  
        return ret;
  
 -free_clock:
 +free_ipg_clock:
 +      clk_disable_unprepare(mps->clk_ipg);
 +free_mclk_clock:
        clk_disable_unprepare(mps->clk_mclk);
- free_irq:
-       free_irq(mps->irq, mps);
  free_master:
-       if (mps->psc)
-               iounmap(mps->psc);
        spi_master_put(master);
  
        return ret;
@@@ -570,10 -556,6 +565,7 @@@ static int mpc512x_psc_spi_do_remove(st
        struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);
  
        clk_disable_unprepare(mps->clk_mclk);
-       free_irq(mps->irq, mps);
-       if (mps->psc)
-               iounmap(mps->psc);
 +      clk_disable_unprepare(mps->clk_ipg);
  
        return 0;
  }

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