Merge branch 'next/mct-exynos' into next/clk-exynos

Conflicts:
	arch/arm/mach-exynos/mach-exynos4-dt.c

diff --cc arch/arm/Kconfig
Simple merge

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

diff --cc arch/arm/mach-exynos/Kconfig
Simple merge

diff --cc arch/arm/mach-exynos/mach-exynos4-dt.c
index fad268f8548c7f915e40e976a9be3b2445f7a716,c4ae108e192d643da003981874f40fa6789d7f25..daa7b0da9a2d0cc9b44e68ad83562cfc07d9f87f
--- 1/arch/arm/mach-exynos/mach-exynos4-dt.c
--- 2/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@@ -12,9 -12,8 +12,10 @@@
  */
  
  #include <linux/of_platform.h>
 +#include <linux/of_fdt.h>
  #include <linux/serial_core.h>
 +#include <linux/memblock.h>
+ #include <linux/clocksource.h>
  
  #include <asm/mach/arch.h>
  #include <mach/map.h>
@@@ -158,8 -143,7 +159,8 @@@ DT_MACHINE_START(EXYNOS4210_DT, "Samsun
        .map_io         = exynos4_dt_map_io,
        .init_machine   = exynos4_dt_machine_init,
        .init_late      = exynos_init_late,
-       .init_time      = exynos4_timer_init,
+       .init_time      = clocksource_of_init,
        .dt_compat      = exynos4_dt_compat,
        .restart        = exynos4_restart,
 +      .reserve        = exynos4_reserve,
  MACHINE_END

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