Merge commit 'v2.6.37-rc4' into imx-for-2.6.38

Done to resolve merge conflict:

Conflicts:
	arch/arm/mach-mx25/devices-imx25.h

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

diff --cc arch/arm/mach-imx/devices-imx25.h
index 760e66c57c1bfb8c380c8b6a2ab1db66c27f9689,d94d282fa6763c08bf09a2f0128e9de97099a92f..bde33caf1b90001b3cc53f145062fe80803b5bb7
--- 1/arch/arm/mach-imx/devices-imx25.h
--- 2/arch/arm/mach-mx25/devices-imx25.h
+++ b/arch/arm/mach-imx/devices-imx25.h
@@@ -74,14 -42,9 +74,14 @@@ extern const struct imx_mxc_nand_data i
  #define imx25_add_mxc_nand(pdata)     \
        imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)
  
- extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst;
 +extern const struct imx_sdhci_esdhc_imx_data
 +imx25_sdhci_esdhc_imx_data[] __initconst;
 +#define imx25_add_sdhci_esdhc_imx(id, pdata)  \
 +      imx_add_sdhci_esdhc_imx(&imx25_sdhci_esdhc_imx_data[id], pdata)
 +
+ extern const struct imx_spi_imx_data imx25_cspi_data[] __initconst;
  #define imx25_add_spi_imx(id, pdata)  \
 -      imx_add_spi_imx(&imx25_cspi_data[id], pdata)
 +      imx_add_spi_imx(&imx25_spi_imx_data[id], pdata)
  #define imx25_add_spi_imx0(pdata)     imx25_add_spi_imx(0, pdata)
  #define imx25_add_spi_imx1(pdata)     imx25_add_spi_imx(1, pdata)
  #define imx25_add_spi_imx2(pdata)     imx25_add_spi_imx(2, pdata)

diff --cc arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
Simple merge

diff --cc arch/arm/plat-mxc/devices/platform-imx-dma.c
Simple merge

diff --cc arch/arm/plat-mxc/devices/platform-spi_imx.c
index e1ffa1f665e223237c4acdc4cb4f901835384d83,17f724c9452d3d5520f451bfd8a198216b4fd503..8ea49adcdfc1ccfcf3384c416a4aff3aed6dd5ef
--- 1/arch/arm/plat-mxc/devices/platform-spi_imx.c
--- 2/arch/arm/plat-mxc/devices/platform-spi_imx.c
+++ b/arch/arm/plat-mxc/devices/platform-spi_imx.c
@@@ -27,9 -27,10 +27,10 @@@ const struct imx_spi_imx_data imx21_csp
        imx_spi_imx_data_entry(MX21, CSPI, "imx21-cspi", _id, _hwid, SZ_4K)
        imx21_cspi_data_entry(0, 1),
        imx21_cspi_data_entry(1, 2),
+ };
  #endif
  
 -#ifdef CONFIG_ARCH_MX25
 +#ifdef CONFIG_SOC_IMX25
  const struct imx_spi_imx_data imx25_cspi_data[] __initconst = {
  #define imx25_cspi_data_entry(_id, _hwid)                             \
        imx_spi_imx_data_entry(MX25, CSPI, "imx25-cspi", _id, _hwid, SZ_16K)