Merge branch 'spi-drivers' into spi-next

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

diff --cc drivers/spi/spi-omap2-mcspi.c
index b2fb141da37565de69139fee9743b153fb463699,84aeaf0e5a0f3d0b3a304791fab4912d1c3bdf23..259f601f0db40b2d9fb2547145ba4615c3573a6d
--- 1/drivers/spi/spi-omap2-mcspi.c
--- 2/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@@ -1237,8 -1239,7 +1237,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;
  }