Skip to content
Snippets Groups Projects
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
Branches
Tags
Loading
Showing
with 199 additions and 47 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment