Skip to content
Commit 7b27fa25 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/dt2' into HEAD 

Conflicts:
	arch/arm/mach-exynos/clock-exynos5.c
parents a8e1ceb7 6fd9b70e
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