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

Conflicts:
	drivers/mfd/max8997.c

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

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

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

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

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

diff --cc arch/arm/mach-mx5/mx51_efika.c
Simple merge

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

diff --cc drivers/gpio/Kconfig
index 4caa3d37bbde5783164f47cc68e278bb4d243c0d,fbc5fd449a047d51f9cb1df3fa9be5fe01048e66..edbbd0f4bf3f6a633a08312bda72491d68b0b11d
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -178,18 -178,9 +178,18 @@@ config GPIO_SC
          The Intel Tunnel Creek processor has 5 GPIOs powered by the
          core power rail and 9 from suspend power supply.
  
 +config GPIO_U300
 +      bool "ST-Ericsson U300 COH 901 335/571 GPIO"
 +      depends on GPIOLIB && ARCH_U300
 +      help
 +        Say yes here to support GPIO interface on ST-Ericsson U300.
 +        The names of the two IP block variants supported are
 +        COH 901 335 and COH 901 571/3. They contain 3, 5 or 7
 +        ports of 8 GPIO pins each.
 +
  config GPIO_VX855
        tristate "VIA VX855/VX875 GPIO"
-       depends on MFD_SUPPORT && PCI
+       depends on PCI
        select MFD_CORE
        select MFD_VX855
        help

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

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

diff --cc drivers/input/misc/Makefile
Simple merge

diff --cc drivers/mfd/menelaus.c
Simple merge