Merge branch 'next/mct-exynos' into next/clk-exynos
authorKukjin Kim <kgene.kim@samsung.com>
Sat, 9 Mar 2013 07:56:34 +0000 (16:56 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 9 Mar 2013 07:56:34 +0000 (16:56 +0900)
commit8ec46b97f24d60645c8f708c87e0caecebd25d77
tree3663c411f7a4e7a9bfc0a8e720679b93a5860b7c
parentb85b64cc22122adca695e0f8c340cc677ad92e8c
parent6938d75a8c1a1752f9fa7ef14a0c570036c7b73b
Merge branch 'next/mct-exynos' into next/clk-exynos

Conflicts:
arch/arm/mach-exynos/mach-exynos4-dt.c
arch/arm/Kconfig
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/mach-exynos4-dt.c
arch/arm/mach-exynos/mach-exynos5-dt.c