From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 25 Sep 2012 12:37:05 +0000 (+0100)
Subject: Merge tag 'v3.6-rc6' into spi-drivers
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8e5d0661b3948f3c5a143f32d192710375822af2;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

Linux 3.6-rc6

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

8e5d0661b3948f3c5a143f32d192710375822af2
diff --cc drivers/spi/spi-omap2-mcspi.c
index 9926f2784bba,b2fb141da375..06684d995d3b
--- a/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;
  }