Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
	drivers/mtd/nand/Kconfig

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/kernel/Makefile
Simple merge

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

diff --cc arch/arm/mach-omap2/board-igep0020.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge

diff --cc arch/arm/mach-omap2/twl-common.c
Simple merge

diff --cc arch/arm/mach-realview/realview_eb.c
index d7a6e9cebba4792d9306091bdf8e5c7043a69135,21661ade885ffd7f29c4d7d223332777cf275ce6..36f5d296131e832eb750a5a97998bb738fd297dc
--- 1/arch/arm/mach-realview/realview_eb.c
--- 2/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@@ -30,8 -30,8 +30,7 @@@
  
  #include <mach/hardware.h>
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  #include <asm/hardware/cache-l2x0.h>

diff --cc arch/arm/mach-realview/realview_pb1176.c
index 361f898884c890ca2769267970b412dd53dce25f,c0ff882c5cb865bb31ef3e07c5c498f0c9de11f7..049c3738777b701e766b07b56b35a9dd3050b2cd
--- 1/arch/arm/mach-realview/realview_pb1176.c
--- 2/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@@ -32,8 -32,8 +32,7 @@@
  
  #include <mach/hardware.h>
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  #include <asm/hardware/cache-l2x0.h>

diff --cc arch/arm/mach-realview/realview_pb11mp.c
index c56bc8d4d11ba2730a67d50a775b9c706b397f14,30779ae40c046a85cdb7456918f02812cc2bc451..9966672d86cdf9f74f8f692f3fa6f8ad24d2da71
--- 1/arch/arm/mach-realview/realview_pb11mp.c
--- 2/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@@ -30,8 -30,8 +30,7 @@@
  
  #include <mach/hardware.h>
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  #include <asm/hardware/cache-l2x0.h>

diff --cc arch/arm/mach-realview/realview_pba8.c
index 0409375824531e883fb2916ec9b2c888f24aa8e4,081cd72c090e01ad41a106f86267958bbb3a7505..25fdc6b0135cdf067e527389f3bdb1d7ddff8f99
--- 1/arch/arm/mach-realview/realview_pba8.c
--- 2/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@@ -29,8 -29,8 +29,7 @@@
  #include <linux/io.h>
  
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>
  

diff --cc arch/arm/mach-realview/realview_pbx.c
index 97885dc11e8cb89575c96cc69fb07f7f9bb40dd9,1ce62b9f846c2a1b306124b422c4fd9bd73b209a..05f28d853c706d825cca0f77960767494d4109ba
--- 1/arch/arm/mach-realview/realview_pbx.c
--- 2/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@@ -28,8 -28,8 +28,7 @@@
  #include <linux/io.h>
  
  #include <asm/irq.h>
- #include <asm/leds.h>
  #include <asm/mach-types.h>
 -#include <asm/pmu.h>
  #include <asm/smp_twd.h>
  #include <asm/pgtable.h>
  #include <asm/hardware/gic.h>

diff --cc arch/arm/mach-ux500/cpu-db8500.c
Simple merge

diff --cc arch/powerpc/sysdev/fsl_msi.c
index 7e2b2f2e3ecde13f9e95c88801297d09c49a2583,51ffafae561ea5a4a12da1f401c76da164811fff..63c5f04ea580177649aba38d101cb3f86b40cb35
--- 1/arch/powerpc/sysdev/fsl_msi.c
--- 2/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@@ -509,14 -506,12 +509,14 @@@ static const struct of_device_id fsl_of
        },
        {
                .compatible = "fsl,ipic-msi",
-               .data = (void *)&ipic_msi_feature,
+               .data = &ipic_msi_feature,
        },
 +#ifdef CONFIG_EPAPR_PARAVIRT
        {
                .compatible = "fsl,vmpic-msi",
-               .data = (void *)&vmpic_msi_feature,
+               .data = &vmpic_msi_feature,
        },
 +#endif
        {}
  };
  

diff --cc drivers/gpio/gpio-pxa.c
index 9cac88a65f78402e2a45b919799576810d9ab9fd,db5c2958f97387cf4df60d5bca7c08d2bc61f482..9528779ca463154334fa54db9a22b6f852cddd0f
--- 1/drivers/gpio/gpio-pxa.c
--- 2/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@@ -530,12 -464,12 +489,12 @@@ static int pxa_irq_domain_map(struct ir
  
  const struct irq_domain_ops pxa_irq_domain_ops = {
        .map    = pxa_irq_domain_map,
 +      .xlate  = irq_domain_xlate_twocell,
  };
  
 -#ifdef CONFIG_OF
  static int __devinit pxa_gpio_probe_dt(struct platform_device *pdev)
  {
-       int ret, nr_banks, nr_gpios, irq_base;
+       int ret, nr_banks, nr_gpios;
        struct device_node *prev, *next, *np = pdev->dev.of_node;
        const struct of_device_id *of_id =
                                of_match_device(pxa_gpio_dt_ids, &pdev->dev);

diff --cc drivers/i2c/busses/i2c-omap.c
Simple merge

diff --cc drivers/mmc/host/omap_hsmmc.c
Simple merge

diff --cc drivers/mtd/nand/pxa3xx_nand.c
Simple merge

diff --cc drivers/spi/spi-omap2-mcspi.c
Simple merge

diff --cc include/linux/leds.h
Simple merge