Skip to content
Commit 4e0f3fcf authored by Simon Horman's avatar Simon Horman
Browse files

Merge branch 'dt2' into cleanup3-base 

Conflicts:
	arch/arm/mach-shmobile/Makefile.boot
parents 98724b7e 8b3e32c1
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