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

Merge branch 'tegra/soc' into next/cleanup2 



Conflicts:
	arch/arm/mach-tegra/Makefile

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 83b5938c d405e4b0
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