Merge branch 'v3.16-next/dt-samsung' into for-next

Conflicts:
	arch/arm/mach-exynos/firmware.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/exynos5420.dtsi
Simple merge

diff --cc arch/arm/mach-exynos/common.h
Simple merge

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

diff --cc arch/arm/mach-exynos/firmware.c
index aa01c4222b40334db58a603cbcbee82f5f671d6b,483dfcd690650c54674584169b99ef00967964d0..739bdc88b651b6e1129778e77242deb4e54d4245
--- 1/arch/arm/mach-exynos/firmware.c
--- 2/arch/arm/mach-exynos/firmware.c
+++ b/arch/arm/mach-exynos/firmware.c
@@@ -44,10 -35,12 +43,15 @@@ static int exynos_cpu_boot(int cpu
  
  static int exynos_set_cpu_boot_addr(int cpu, unsigned long boot_addr)
  {
-       void __iomem *boot_reg = S5P_VA_SYSRAM_NS + 0x1c;
+       void __iomem *boot_reg;
+ 
+       if (!sysram_ns_base_addr)
+               return -ENODEV;
+ 
 -      boot_reg = sysram_ns_base_addr + 0x1c + 4*cpu;
++      boot_reg = sysram_ns_base_addr + 0x1c;
 +
 +      if (!soc_is_exynos4212())
 +              boot_reg += 4*cpu;
  
        __raw_writel(boot_addr, boot_reg);
        return 0;

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