Merge remote-tracking branch 'pinctrl/for-next'

Conflicts:
	arch/arm/mach-u300/Kconfig
	arch/arm/mach-u300/core.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-u300/Kconfig
index 39e077e2f243994bda6c618f3c4bb30276d5bdb6,449fd6a8dbd668ba22f52313b95d96d07c74ea73..34bb3f9b46bfb61eb326d06f4517bd1e79851389
--- 1/arch/arm/mach-u300/Kconfig
--- 2/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@@ -6,7 -6,8 +6,9 @@@ comment "ST-Ericsson Mobile Platform Pr
  
  config MACH_U300
        bool "U300"
 +      select GPIO_U300
+       select PINCTRL
+       select PINMUX_U300
  
  comment "ST-Ericsson U300/U330/U335/U365 Feature Selections"
  

diff --cc arch/arm/mach-u300/core.c
index 2f1d758133a77108cb786434f937f86da1583079,2f5929bdeaa2037fc916e316441d0b4bc764b5e0..b73a451bbc9f446d265861a25a0d204961822fff
--- 1/arch/arm/mach-u300/core.c
--- 2/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@@ -25,7 -25,8 +25,9 @@@
  #include <linux/err.h>
  #include <linux/mtd/nand.h>
  #include <linux/mtd/fsmc.h>
 +#include <linux/dma-mapping.h>
+ #include <linux/pinctrl/machine.h>
+ #include <linux/pinctrl/pinmux.h>
  
  #include <asm/types.h>
  #include <asm/setup.h>
@@@ -1600,6 -1719,8 +1676,7 @@@ static struct platform_device *platform
        &gpio_device,
        &nand_device,
        &wdog_device,
 -      &ave_device,
+       &pinmux_device,
  };
  
  /*

diff --cc arch/arm/mach-u300/mmc.c
index d9a5c92db74a5cc0aa9a69276bdd17fc464628ff,d5e4a98a9ab8783340677bfabf29e3f2dca369f6..4d482aacc2720e82c14238f69f247985339e93f2
--- 1/arch/arm/mach-u300/mmc.c
--- 2/arch/arm/mach-u300/mmc.c
+++ b/arch/arm/mach-u300/mmc.c
@@@ -18,10 -19,8 +18,9 @@@
  #include <linux/slab.h>
  #include <mach/coh901318.h>
  #include <mach/dma_channels.h>
 +#include <mach/gpio-u300.h>
  
  #include "mmc.h"
- #include "padmux.h"
  
  static struct mmci_platform_data mmc0_plat_data = {
        /*

diff --cc drivers/Kconfig
Simple merge

diff --cc drivers/Makefile
Simple merge