Merge tag 'v3.6-rc6' into spi-drivers

Linux 3.6-rc6

Conflicts:
	drivers/spi/spi-omap2-mcspi.c

diff --cc drivers/spi/spi-omap2-mcspi.c
index 9926f27,b2fb141..06684d9
--- 1/drivers/spi/spi-omap2-mcspi.c
--- 2/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@@ -1271,7 -1237,8 +1269,7 @@@ disable_pm
  dma_chnl_free:
        kfree(mcspi->dma_channels);
  free_master:
-       kfree(master);
+       spi_master_put(master);
 -      platform_set_drvdata(pdev, NULL);
        return status;
  }
  

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

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