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

Merge branch 'next/mct-exynos' into next/clk-exynos 

Conflicts:
	arch/arm/mach-exynos/mach-exynos4-dt.c
parents b85b64cc 6938d75a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment