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)
1  2 
arch/arm/mach-exynos/exynos.c
arch/arm/mach-exynos/regs-pmu.h

Simple merge
Simple merge