Merge remote-tracking branch 'slave-dma/next'

Conflicts:
	drivers/dma/mmp_tdma.c
	drivers/mmc/host/davinci_mmc.c
	drivers/spi/spi-davinci.c

diff --cc arch/arm/mach-spear13xx/spear13xx.c
Simple merge

diff --cc drivers/dma/mmp_tdma.c
index 6d9c82e891d7c722505fe50507bd34218cb6bc2d,b93d73ca84ff1d8d48b4bdd7d1591bf8031d6b6a..05ce16fdf5b2d26bf1f510d2423da7a654f677d0
--- 1/drivers/dma/mmp_tdma.c
--- 2/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@@ -19,7 -19,8 +19,8 @@@
  #include <linux/platform_device.h>
  #include <linux/device.h>
  #include <mach/regs-icu.h>
 -#include <mach/sram.h>
+ #include <linux/of_device.h>
 +#include <linux/platform_data/dma-mmp_tdma.h>
  
  #include "dmaengine.h"
  

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

diff --cc drivers/dma/pl330.c
index 169c0dbd71aef5d171ca9b5ec9af8626939366b0,28322dced886b9655ef67c78a83f0e2ee65b0942..665668b6f2b14f7d6df5179d5ae37576336d1ea6
--- 1/drivers/dma/pl330.c
--- 2/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@@ -2930,11 -2913,6 +2915,11 @@@ pl330_probe(struct amba_device *adev, c
                num_chan = max_t(int, pi->pcfg.num_peri, pi->pcfg.num_chan);
  
        pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);
-               goto probe_err5;
 +      if (!pdmac->peripherals) {
 +              ret = -ENOMEM;
 +              dev_err(&adev->dev, "unable to allocate pdmac->peripherals\n");
++              goto probe_err4;
 +      }
  
        for (i = 0; i < num_chan; i++) {
                pch = &pdmac->peripherals[i];

diff --cc drivers/dma/sirf-dma.c
Simple merge

diff --cc drivers/dma/ste_dma40.c
Simple merge

diff --cc drivers/dma/tegra20-apb-dma.c
Simple merge

diff --cc drivers/mmc/host/davinci_mmc.c
index 3dfd3473269de965bb0500acd2ef5512ebe9269f,c5e1eebcd5888bdf6186f27e17213d33dee08401..20636772c09bd2aa2b794f44c3029e1f57559578
--- 1/drivers/mmc/host/davinci_mmc.c
--- 2/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@@ -30,11 -30,12 +30,12 @@@
  #include <linux/io.h>
  #include <linux/irq.h>
  #include <linux/delay.h>
+ #include <linux/dmaengine.h>
  #include <linux/dma-mapping.h>
+ #include <linux/edma.h>
  #include <linux/mmc/mmc.h>
  
 -#include <mach/mmc.h>
 +#include <linux/platform_data/mmc-davinci.h>
- #include <mach/edma.h>
  
  /*
   * Register Definitions

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/spi-davinci.c
index 3afe2f4f5b8eb231bae471d6e4bdd5d48d385dae,c1ec52d467147858cd2a1ff23a9670fee3335655..147dfa87a64b6260b52f71b62d7880ec6905fdfb
--- 1/drivers/spi/spi-davinci.c
--- 2/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@@ -30,8 -32,7 +32,7 @@@
  #include <linux/spi/spi_bitbang.h>
  #include <linux/slab.h>
  
 -#include <mach/spi.h>
 +#include <linux/platform_data/spi-davinci.h>
- #include <mach/edma.h>
  
  #define SPI_NO_RESOURCE               ((resource_size_t)-1)