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)
Conflicts:
arch/arm/mach-exynos/mach-exynos4-dt.c


Trivial merge