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

Conflicts:
	arch/arm/mach-ux500/cpu-db8500.c
	drivers/i2c/busses/i2c-omap.c
	drivers/mtd/nand/Kconfig
	drivers/usb/host/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/configs/kzm9g_defconfig
Simple merge

diff --cc arch/arm/include/asm/io.h
Simple merge

diff --cc arch/arm/kernel/Makefile
index 3319aca0e0a34c0c9326e23929dcb1a6d1d1d533,d81f3a6d9ad84df7917d2a1edefb68b0dcae6ac9..5dfef9d97ed92b960d8d359997a20108759d60c8
--- 1/arch/arm/kernel/Makefile
--- 2/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@@ -19,11 -19,8 +19,10 @@@ obj-y               := elf.o entry-armv.o entry-comm
                   process.o ptrace.o return_address.o sched_clock.o \
                   setup.o signal.o stacktrace.o sys_arm.o time.o traps.o
  
 -obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += compat.o
 +obj-$(CONFIG_ATAGS)           += atags_parse.o
 +obj-$(CONFIG_ATAGS_PROC)      += atags_proc.o
 +obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += atags_compat.o
  
- obj-$(CONFIG_LEDS)            += leds.o
  obj-$(CONFIG_OC_ETM)          += etm.o
  obj-$(CONFIG_CPU_IDLE)                += cpuidle.o
  obj-$(CONFIG_ISA_DMA_API)     += dma.o

diff --cc arch/arm/mach-at91/at91rm9200_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9261_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9rl_devices.c
Simple merge

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

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

diff --cc arch/arm/mach-shmobile/board-kzm9g.c
Simple merge

diff --cc arch/arm/mach-tegra/pcie.c
Simple merge

diff --cc arch/arm/mach-u300/i2c.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc arch/arm/mm/cache-l2x0.c
Simple merge

diff --cc arch/arm/mm/mmu.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/Makefile
Simple merge

diff --cc drivers/gpio/gpio-pxa.c
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/i2c/busses/i2c-omap.c
index c78431a4970a814a814baac01a518c0f1e7112c8,a0e49f6aaf96eaa81ac712a4a279fafbdf13af95..0b0254312d21f7f39e902e15c8862334d41045ad
--- 1/drivers/i2c/busses/i2c-omap.c
--- 2/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@@ -1051,11 -943,12 +1051,12 @@@ omap_i2c_probe(struct platform_device *
  {
        struct omap_i2c_dev     *dev;
        struct i2c_adapter      *adap;
 -      struct resource         *mem, *irq, *ioarea;
 +      struct resource         *mem;
-       struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
+       const struct omap_i2c_bus_platform_data *pdata =
+               pdev->dev.platform_data;
        struct device_node      *node = pdev->dev.of_node;
        const struct of_device_id *match;
 -      irq_handler_t isr;
 +      int irq;
        int r;
  
        /* NOTE: driver uses the static register mapping */

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc drivers/leds/Makefile
Simple merge

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

diff --cc drivers/mtd/nand/bcm_umi_nand.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 drivers/tty/serial/mpc52xx_uart.c
Simple merge

diff --cc drivers/usb/Kconfig
Simple merge

diff --cc drivers/usb/host/Kconfig
index 13cd6d558ebac6c7bc2c26f1f12b4400e36af6c5,276add2358a18bb14fd82c681a676fd73fb743ce..73152fdede37457b1e2a1abaf5290448c77e9046
--- 1/drivers/usb/host/Kconfig
--- 2/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@@ -292,7 -292,7 +292,7 @@@ config USB_OHCI_HC
        depends on USB && USB_ARCH_HAS_OHCI
        select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
        select USB_OTG_UTILS if ARCH_OMAP
-       depends on USB_ISP1301 || !(ARCH_LPC32XX || ARCH_PNX4008)
 -      select USB_ISP1301 if ARCH_LPC32XX
++      depends on USB_ISP1301 || !ARCH_LPC32XX
        ---help---
          The Open Host Controller Interface (OHCI) is a standard for accessing
          USB 1.1 host controller hardware.  It does more in hardware than Intel's

diff --cc drivers/usb/host/ohci-hcd.c
Simple merge

diff --cc drivers/usb/host/ohci-nxp.c
Simple merge

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

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