]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit55628cf9045f4aea41dcc583c2560ef5119bd6cc
tree3663c411f7a4e7a9bfc0a8e720679b93a5860b7c
parentb977bf361245a88a23991a8a222d1db4bc955a7c
parent5348315b57c26fd257cdab0b2072d25807670014
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