Skip to content
Commit 0f830e5c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'for-3.4/soc-drivers' into for-3.4/t30-smp 

Conflicts:
	arch/arm/mach-tegra/Makefile
parents 9335e919 bdc93a77
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