Skip to content
Commit 692e5c4e authored by Tom Rini's avatar Tom Rini
Browse files

Merge branch 'master' of git://git.denx.de/u-boot-tegra 



Conflicts:
	board/armltd/vexpress64/vexpress64.c

Signed-off-by: default avatarTom Rini <trini@konsulko.com>
parents 8a5c9ca4 76a30fed
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