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

Conflicts:
	arch/xtensa/Kconfig
	drivers/leds/leds-s3c24xx.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-s3c24xx/simtec-usb.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/Kconfig
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-mini6410.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-smartq.c
Simple merge

diff --cc arch/xtensa/Kconfig
index c3ccf379289a5f88840642063386bbac1c3e5c4d,f8df0cc70cb63bf2f0fa5e509f474f92cacc112c..55782c4a803ba1119a7059f2652229d31ff046d7
--- 1/arch/xtensa/Kconfig
--- 2/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@@ -65,9 -64,9 +65,12 @@@ config MM
  config VARIANT_IRQ_SWITCH
        def_bool n
  
 +config MAY_HAVE_SMP
 +      def_bool n
 +
+ config HAVE_XTENSA_GPIO32
+       def_bool n
+ 
  menu "Processor type and features"
  
  choice

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge

diff --cc drivers/gpio/gpio-msm-v2.c
Simple merge

diff --cc drivers/gpio/gpio-rcar.c
Simple merge

diff --cc drivers/gpio/gpio-twl4030.c
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc drivers/leds/leds-s3c24xx.c
index b7876eb09e8c47abca0712f9f1d16850aaaed49a,87cf215af798c97076df857b0609292c1f752cfe..98174e7240ee9f41b8a4d0cddae494ebff99da65
--- 1/drivers/leds/leds-s3c24xx.c
--- 2/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
@@@ -18,9 -18,11 +18,10 @@@
  #include <linux/gpio.h>
  #include <linux/slab.h>
  #include <linux/module.h>
 +#include <linux/platform_data/leds-s3c24xx.h>
  
 -#include <mach/hardware.h>
  #include <mach/regs-gpio.h>
 -#include <linux/platform_data/leds-s3c24xx.h>
+ #include <plat/gpio-cfg.h>
  
  /* our context */
  

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

diff --cc drivers/pinctrl/pinctrl-as3722.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-at91.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-baytrail.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-nomadik.c
Simple merge