Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:20:17 +0000 (10:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:20:17 +0000 (10:20 +1100)
1  2 
MAINTAINERS
arch/arm/mach-exynos/suspend.c
drivers/soc/Kconfig
drivers/soc/Makefile

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -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"
@@@ -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/