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

Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2 

Conflicts:
	arch/arm/plat-s5p/include/plat/pll.h
parents db3c94a7 e90a0f3c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment