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

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-ux500/cpu-db8500.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index bf3a132c69a1d7f06c1926001b01e52a30cf059d,ef6d059a0718c894242d538cf1d2819865f41e11..c406f262ef3768aa829ddfd68251327fedc5c97e
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -366,8 -364,6 +366,7 @@@ config ARCH_CNS3XX
  
  config ARCH_CLPS711X
        bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
-       select ARCH_USES_GETTIMEOFFSET
 +      select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select COMMON_CLK
        select CPU_ARM720T

diff --cc arch/arm/Makefile
index 554cfac414295fc15f3d3d2f9737a906b4ba1212,451757d85ee31195157eb1542a21b51ce107b24c..97252d86a7014d47ff00cb896d594e0364d68132
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -196,9 -195,9 +196,8 @@@ machine-$(CONFIG_ARCH_ZYNQ)                += zyn
  
  # Platform directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
- plat-$(CONFIG_ARCH_MXC)               += mxc
  plat-$(CONFIG_ARCH_OMAP)      += omap
  plat-$(CONFIG_ARCH_S3C64XX)   += samsung
 -plat-$(CONFIG_ARCH_ZYNQ)      += versatile
  plat-$(CONFIG_PLAT_IOP)               += iop
  plat-$(CONFIG_PLAT_NOMADIK)   += nomadik
  plat-$(CONFIG_PLAT_ORION)     += orion

diff --cc arch/arm/mach-imx/clk-imx25.c
index 01e2f843bf2e0d65910bf0951f12555077f7693e,60d0902b18698e93935052fa355ff6559389d7d8..bc885801cd68767aec757a851a8997f3ba5bbc5e
--- 1/arch/arm/mach-imx/clk-imx25.c
--- 2/arch/arm/mach-imx/clk-imx25.c
+++ b/arch/arm/mach-imx/clk-imx25.c
@@@ -203,18 -203,18 +203,18 @@@ int __init mx25_clocks_init(void
        clk_register_clkdev(clk[cspi2_ipg], NULL, "imx35-cspi.1");
        clk_register_clkdev(clk[cspi3_ipg], NULL, "imx35-cspi.2");
        clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.0");
 -      clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.0");
 +      clk_register_clkdev(clk[per10], "per", "mxc_pwm.0");
        clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.1");
 -      clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.1");
 +      clk_register_clkdev(clk[per10], "per", "mxc_pwm.1");
        clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.2");
 -      clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.2");
 +      clk_register_clkdev(clk[per10], "per", "mxc_pwm.2");
        clk_register_clkdev(clk[pwm1_ipg], "ipg", "mxc_pwm.3");
 -      clk_register_clkdev(clk[pwm_ipg_per], "per", "mxc_pwm.3");
 +      clk_register_clkdev(clk[per10], "per", "mxc_pwm.3");
        clk_register_clkdev(clk[kpp_ipg], NULL, "imx-keypad");
        clk_register_clkdev(clk[tsc_ipg], NULL, "mx25-adc");
-       clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx-i2c.0");
-       clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx-i2c.1");
-       clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx-i2c.2");
+       clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.0");
+       clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.1");
+       clk_register_clkdev(clk[i2c_ipg_per], NULL, "imx21-i2c.2");
        clk_register_clkdev(clk[fec_ipg], "ipg", "imx25-fec.0");
        clk_register_clkdev(clk[fec_ahb], "ahb", "imx25-fec.0");
        clk_register_clkdev(clk[dryice_ipg], NULL, "imxdi_rtc.0");

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

diff --cc arch/arm/mach-ux500/cpu-db8500.c
index 87a8f9fbb100b05b1c2eac4f9bbb9ed4da0f767b,50202a163e5d39684134d56cdf8b5908882091af..ca7c7ed890d2e39cf7d37b473aa7dff985a6e667
--- 1/arch/arm/mach-ux500/cpu-db8500.c
--- 2/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@@ -18,7 -18,7 +18,8 @@@
  #include <linux/io.h>
  #include <linux/mfd/abx500/ab8500.h>
  #include <linux/platform_data/usb-musb-ux500.h>
 +#include <linux/platform_data/pinctrl-nomadik.h>
+ #include <linux/random.h>
  
  #include <asm/pmu.h>
  #include <asm/mach/map.h>

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

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/hwmon/Makefile
Simple merge

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

diff --cc drivers/mmc/host/omap_hsmmc.c
index 5434fd8e088ada0bb7b360f5028f58b05320e15e,9b24bd46aad3ea5fd26d887e91eef1f46bdb76b5..7546cb2a2511f2e4ed9e617462944bad254391f2
--- 1/drivers/mmc/host/omap_hsmmc.c
--- 2/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@@ -37,11 -37,8 +37,9 @@@
  #include <linux/io.h>
  #include <linux/gpio.h>
  #include <linux/regulator/consumer.h>
 +#include <linux/pinctrl/consumer.h>
  #include <linux/pm_runtime.h>
- #include <mach/hardware.h>
- #include <plat/mmc.h>
- #include <plat/cpu.h>
+ #include <linux/platform_data/mmc-omap.h>
  
  /* OMAP HSMMC Host Controller Registers */
  #define OMAP_HSMMC_SYSSTATUS  0x0014

diff --cc drivers/staging/tidspbridge/include/dspbridge/host_os.h
Simple merge

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