Skip to content
Commit ee059485 authored by Stephen Warren's avatar Stephen Warren
Browse files

Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114 

Conflicts:
	arch/arm/mach-tegra/platsmp.c
parents 1d328606 80d93756
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