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

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-nomadik/board-nhk8815.c
	arch/arm/mach-omap2/drm.c
	arch/arm/mach-ux500/board-mop500-audio.c
	arch/arm/mach-ux500/board-mop500.c
	arch/arm/mach-ux500/cpu-db8500.c
	drivers/pinctrl/pinctrl-nomadik.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index deae5e3253730dcc166816fe99b9ae8592af472e,ac00c9b8c1e75144e7ba74e6bd0ec8128242bac1..acc1f79fa4d90a785a80aa523bca9b3bfe4e95e3
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -367,8 -364,6 +367,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/Kconfig.debug
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/imx6q.dtsi
Simple merge

diff --cc arch/arm/kernel/smp_twd.c
Simple merge

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

diff --cc arch/arm/mach-nomadik/board-nhk8815.c
index ab7104fded399c60f3e7a780e150ed2f4e03be58,5ccdf53c5a9dcd0c3a6814d61b49d083e34a89eb..9f19069248da2341e643f1c6161fc8576c5803c3
--- 1/arch/arm/mach-nomadik/board-nhk8815.c
--- 2/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@@ -26,15 -25,16 +26,14 @@@
  #include <linux/io.h>
  #include <linux/pinctrl/machine.h>
  #include <linux/platform_data/pinctrl-nomadik.h>
 -#include <linux/platform_data/mtd-nomadik-nand.h>
+ #include <linux/platform_data/clocksource-nomadik-mtu.h>
  #include <asm/hardware/vic.h>
  #include <asm/sizes.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
- #include <asm/mach/irq.h>
  #include <asm/mach/flash.h>
  #include <asm/mach/time.h>
- 
- #include <plat/mtu.h>
 -#include <mach/fsmc.h>
+ #include <mach/irqs.h>
  
  #include "cpu-8815.h"
  

diff --cc arch/arm/mach-omap2/drm.c
index 49a7ffb716a520f1c7bb12938c3559e45dc088c7,6282cc82661355afe27abdeb114f92ba6895b747..fce5aa3fff49b8cfea304426da3d316e71055273
--- 1/arch/arm/mach-omap2/drm.c
--- 2/arch/arm/mach-omap2/drm.c
+++ b/arch/arm/mach-omap2/drm.c
@@@ -23,11 -23,9 +23,11 @@@
  #include <linux/init.h>
  #include <linux/platform_device.h>
  #include <linux/dma-mapping.h>
 +#include <linux/platform_data/omap_drm.h>
  
- #include <plat/omap_device.h>
- #include <plat/omap_hwmod.h>
+ #include "omap_device.h"
+ #include "omap_hwmod.h"
 +#include <plat/cpu.h>
  
  #if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)
  

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

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

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/hwmon/Makefile
Simple merge

diff --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/mfd/Makefile
Simple merge

diff --cc drivers/mfd/ab8500-core.c
Simple merge

diff --cc drivers/mfd/db8500-prcmu.c
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/mtd/nand/Kconfig
Simple merge

diff --cc drivers/pinctrl/pinctrl-nomadik.c
index 6a95d0438b6ab22026a9dae53b546f95e730c061,3ad23fb042b44b9b86277b407d68f7800bb99c96..238060e14623aa743061f81c81dda98c831c3d34
--- 1/drivers/pinctrl/pinctrl-nomadik.c
--- 2/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@@ -30,10 -30,23 +30,9 @@@
  #include <linux/pinctrl/pinconf.h>
  /* Since we request GPIOs from ourself */
  #include <linux/pinctrl/consumer.h>
 -/*
 - * For the U8500 archs, use the PRCMU register interface, for the older
 - * Nomadik, provide some stubs. The functions using these will only be
 - * called on the U8500 series.
 - */
 -#ifdef CONFIG_ARCH_U8500
 -#include <linux/mfd/dbx500-prcmu.h>
 -#else
 -static inline u32 prcmu_read(unsigned int reg) {
 -      return 0;
 -}
 -static inline void prcmu_write(unsigned int reg, u32 value) {}
 -static inline void prcmu_write_masked(unsigned int reg, u32 mask, u32 value) {}
 -#endif
  #include <linux/platform_data/pinctrl-nomadik.h>
- 
  #include <asm/mach/irq.h>
- 
+ #include <mach/irqs.h>
  #include "pinctrl-nomadik.h"
  
  /*

diff --cc drivers/usb/host/ehci-mxc.c
Simple merge

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

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