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

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
index 97ae4703cb784ee607981081c72522f7f16b1e4f,14c96ee5a3fedd1abcfd5cd629a83c6d93b8a598..a564aeea57a4a386560dc1ed77d0d2c97be486c7
--- 1/arch/arm/mach-s3c64xx/mach-mini6410.c
--- 2/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@@ -36,10 -36,9 +36,11 @@@
  #include <plat/devs.h>
  #include <plat/fb.h>
  #include <linux/platform_data/mtd-nand-s3c2410.h>
 +#include <linux/platform_data/mmc-sdhci-s3c.h>
  #include <plat/regs-serial.h>
 +#include <plat/sdhci.h>
  #include <linux/platform_data/touchscreen-s3c2410.h>
+ #include <linux/platform_data/gpio-samsung-s3c64xx.h>
  
  #include <video/platform_lcd.h>
  #include <video/samsung_fimd.h>

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

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/pinctrl/pinctrl-at91.c
Simple merge

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

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