Skip to content
Commit 640ec79d authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'cleanup-soc' into cleanup 

Conflicts:
	arch/arm/mach-omap2/Makefile
parents 7a8bcf06 cf563a35
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