Merge branch 'v3.17-next/cpuidle-exynos' into v3.17-next/power-exynos
authorKukjin Kim <kgene.kim@samsung.com>
Tue, 22 Jul 2014 23:18:15 +0000 (08:18 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Tue, 22 Jul 2014 23:18:15 +0000 (08:18 +0900)
commit5f534d10d223636b3cd214376471fcfef71baea2
tree38c14b78e01e7270ccce6d6144d124a7129ca707
parent036c37c5809585495661d0eb6e78e0a3612ccde3
parentfc2cac41ebbfb16da8b036cba6ec6714ab780a6d
Merge branch 'v3.17-next/cpuidle-exynos' into v3.17-next/power-exynos
arch/arm/mach-exynos/exynos.c
arch/arm/mach-exynos/regs-pmu.h