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

Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc 



Conflicts:
	arch/arm/mach-tegra/board-dt.c

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c3e00a0e 3bdc3484
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