Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit be7004f7 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'next-exynos4-pm' into for-next 

Conflicts:
	arch/arm/mach-exynos4/include/mach/regs-pmu.h
parents 604eefeb 30fe7643
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment