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

Conflicts:
	drivers/pinctrl/Makefile

diff --cc drivers/pinctrl/Kconfig
index 1ffaa326f668b83f4b9eb74401f83b080e3f8765,34e94c7f68caabc10181ea999327a8e88c657cfc..274980dcfa4fc5fdcd92fa657b623e0e6f68c0df
--- 1/drivers/pinctrl/Kconfig
--- 2/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@@ -172,13 -145,17 +172,22 @@@ config PINCTRL_COH90
          COH 901 335 and COH 901 571/3. They contain 3, 5 or 7
          ports of 8 GPIO pins each.
  
+ config PINCTRL_SAMSUNG
+       bool "Samsung pinctrl driver"
+       select PINMUX
+       select PINCONF
+ 
+ config PINCTRL_EXYNOS4
+       bool "Pinctrl driver data for Exynos4 SoC"
+       select PINCTRL_SAMSUNG
+ 
  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 26a86c7baf6cc672a361f153858c02f23e00577a,6a88113e11d9dff2a7fefd066ace97be9baff840..60baaff2d358a5064f429a0ba1dac3da22f5ce21
--- 1/drivers/pinctrl/Makefile
--- 2/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -33,7 -29,7 +33,9 @@@ 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_PLAT_SPEAR)      += spear/

diff --cc drivers/video/s3c-fb.c
Simple merge