Merge branch 'next-exynos4-pm' into for-next
Conflicts: arch/arm/mach-exynos4/include/mach/regs-pmu.h
Showing
arch/arm/mach-exynos4/pm.c
0 → 100644
This diff is collapsed.
Please register or sign in to comment
Conflicts: arch/arm/mach-exynos4/include/mach/regs-pmu.h