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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-exynos/suspend.c
Simple merge

diff --cc drivers/soc/Kconfig
index 4e853ed2c82b937ebd8fb6cf4c22288a122fca3a,69107c9e2c9fd519757f3834c0ba80ee915fa94a..332c19f1b7248174a4d183a76edaeb6349dc1ca8
--- 1/drivers/soc/Kconfig
--- 2/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@@ -1,9 -1,8 +1,10 @@@
  menu "SOC (System On Chip) specific Drivers"
  
 +source "drivers/soc/brcmstb/Kconfig"
  source "drivers/soc/mediatek/Kconfig"
  source "drivers/soc/qcom/Kconfig"
 +source "drivers/soc/rockchip/Kconfig"
+ source "drivers/soc/samsung/Kconfig"
  source "drivers/soc/sunxi/Kconfig"
  source "drivers/soc/ti/Kconfig"
  source "drivers/soc/versatile/Kconfig"

diff --cc drivers/soc/Makefile
index f2ba2e932ae10c5d2cda1de269b826b9875a4a5c,a6236163597d74827eba164135b01eccdcbba4cd..757711972261cd9e30b78d4d0a4c07b3d2dc8dae
--- 1/drivers/soc/Makefile
--- 2/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@@ -6,7 -5,7 +6,8 @@@ obj-$(CONFIG_SOC_BRCMSTB)        += brcmstb
  obj-$(CONFIG_MACH_DOVE)               += dove/
  obj-$(CONFIG_ARCH_MEDIATEK)   += mediatek/
  obj-$(CONFIG_ARCH_QCOM)               += qcom/
+ obj-$(CONFIG_SOC_SAMSUNG)     += samsung/
 +obj-$(CONFIG_ARCH_ROCKCHIP)           += rockchip/
  obj-$(CONFIG_ARCH_SUNXI)      += sunxi/
  obj-$(CONFIG_ARCH_TEGRA)      += tegra/
  obj-$(CONFIG_SOC_TI)          += ti/