Merge branch 'v3.11-next/remove-nondt-exynos-3' into for-next

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-exynos/Kconfig

diff --cc arch/arm/Kconfig
index 7f6dff7826a292abcac98cf4ca27f874c5ec52a3,14f6e1138e889b56872d8f3902a4e9288e5388a8..ddf2667c1feff08f268f1d0c8c72e1dc2d8b7dc2
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -745,7 -749,7 +750,8 @@@ config ARCH_S5P64X
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select HAVE_S3C_RTC if RTC_CLASS
        select NEED_MACH_GPIO_H
+       select SAMSUNG_ATAGS
 +      select SAMSUNG_WDT_RESET
        help
          Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
          SMDK6450.
@@@ -762,7 -767,7 +769,8 @@@ config ARCH_S5PC10
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select HAVE_S3C_RTC if RTC_CLASS
        select NEED_MACH_GPIO_H
+       select SAMSUNG_ATAGS
 +      select SAMSUNG_WDT_RESET
        help
          Samsung S5PC100 series based systems
  

diff --cc arch/arm/mach-exynos/Kconfig
index e51d99060d33d7965d14867dc38f3344df50fbc5,46c8332476f84179aa5069d68fe21f6de031ada3..1e0e3999c17a23e78a357041692120c3bf085424
--- 1/arch/arm/mach-exynos/Kconfig
--- 2/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -418,8 -96,9 +101,7 @@@ config MACH_EXYNOS4_D
        select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
        select CPU_EXYNOS4210
        select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
 -      select PINCTRL
 -      select PINCTRL_EXYNOS
        select S5P_DEV_MFC
-       select USE_OF
        help
          Machine support for Samsung Exynos4 machine with device tree enabled.
          Select this if a fdt blob is available for the Exynos4 SoC based board.
@@@ -432,8 -111,6 +114,7 @@@ config MACH_EXYNOS5_D
        depends on ARCH_EXYNOS5
        select ARM_AMBA
        select CLKSRC_OF
-       select USE_OF
 +      select USB_ARCH_HAS_XHCI
        help
          Machine support for Samsung EXYNOS5 machine with device tree enabled.
          Select this if a fdt blob is available for the EXYNOS5 SoC based board.

diff --cc arch/arm/plat-samsung/Kconfig
Simple merge

diff --cc arch/arm/plat-samsung/Makefile
index 03cea140cfd0b3eb7f6b3606187ccdf48378711b,6348ae2e3b467671f6fe2f3a41720b7598123e38..98d07d8fc7a71ffa869fa397cc8f74977264f17c
--- 1/arch/arm/plat-samsung/Makefile
--- 2/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@@ -56,7 -56,7 +56,8 @@@ obj-$(CONFIG_SAMSUNG_PM_GPIO) += pm-gpi
  obj-$(CONFIG_SAMSUNG_PM_CHECK)        += pm-check.o
  
  obj-$(CONFIG_SAMSUNG_WAKEMASK)        += wakeup-mask.o
 +obj-$(CONFIG_SAMSUNG_WDT_RESET)       += watchdog-reset.o
  
- obj-$(CONFIG_S5P_PM)          += s5p-pm.o s5p-irq-pm.o
+ obj-$(CONFIG_S5P_PM)          += s5p-pm.o
+ obj-$(CONFIG_S5P_IRQ_PM)      += s5p-irq-pm.o
  obj-$(CONFIG_S5P_SLEEP)               += s5p-sleep.o