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

diff --cc arch/arm/Kconfig
Simple merge

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

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

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

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

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge

diff --cc drivers/mmc/host/sdhci-tegra.c
Simple merge

diff --cc drivers/pinctrl/Kconfig
index 638f0e49690d972744c04cca381edbd084d186ac,42005cb67ca050a39846ba341eb595e2dda8d1f7..7bf914df6e91a6129d23f5d12828b8228a8c2775
--- 1/drivers/pinctrl/Kconfig
--- 2/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@@ -186,13 -154,30 +186,35 @@@ config PINCTRL_EXYNOS
        bool "Pinctrl driver data for Exynos4 SoC"
        select PINCTRL_SAMSUNG
  
+ config PINCTRL_MVEBU
+       bool
+       depends on ARCH_MVEBU
+       select PINMUX
+       select PINCONF
+ 
+ config PINCTRL_DOVE
+       bool
+       select PINCTRL_MVEBU
+ 
+ config PINCTRL_KIRKWOOD
+       bool
+       select PINCTRL_MVEBU
+ 
+ config PINCTRL_ARMADA_370
+       bool
+       select PINCTRL_MVEBU
+ 
+ config PINCTRL_ARMADA_XP
+       bool
+       select PINCTRL_MVEBU
+ 
  source "drivers/pinctrl/spear/Kconfig"
  
 +config PINCTRL_XWAY
 +      bool
 +      depends on SOC_TYPE_XWAY
 +      depends on PINCTRL_LANTIQ
 +
  endmenu
  
  endif

diff --cc drivers/pinctrl/Makefile
index 00eb628cfc09525353afe65aec8c0fe8e7bdc124,0ab47c5ed472fde5292184407bbfb8c4e74e9a1f..c9f44565c4a3df8f6acd85ec150af802bddd4130
--- 1/drivers/pinctrl/Makefile
--- 2/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -34,9 -29,12 +34,14 @@@ obj-$(CONFIG_PINCTRL_TEGRA20)       += pinctr
  obj-$(CONFIG_PINCTRL_TEGRA30) += pinctrl-tegra30.o
  obj-$(CONFIG_PINCTRL_U300)    += pinctrl-u300.o
  obj-$(CONFIG_PINCTRL_COH901)  += pinctrl-coh901.o
 +obj-$(CONFIG_PINCTRL_XWAY)    += pinctrl-xway.o
 +obj-$(CONFIG_PINCTRL_LANTIQ)  += pinctrl-lantiq.o
  obj-$(CONFIG_PINCTRL_SAMSUNG) += pinctrl-samsung.o
  obj-$(CONFIG_PINCTRL_EXYNOS4) += pinctrl-exynos.o
+ obj-$(CONFIG_PINCTRL_MVEBU)   += pinctrl-mvebu.o
+ obj-$(CONFIG_PINCTRL_DOVE)    += pinctrl-dove.o
+ obj-$(CONFIG_PINCTRL_KIRKWOOD)        += pinctrl-kirkwood.o
+ obj-$(CONFIG_PINCTRL_ARMADA_370) += pinctrl-armada-370.o
+ obj-$(CONFIG_PINCTRL_ARMADA_XP)  += pinctrl-armada-xp.o
  
  obj-$(CONFIG_PLAT_SPEAR)      += spear/

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