tree e47f18f7dd1507e91a46fcd6f550914ad3774f5a
parent 8a5c9ca4d0b8aa13a1bb321494d24f656a9a7d72
parent 76a30fedd44428c7108084266389c9b4ba5678c8
author Tom Rini <trini@konsulko.com> 1428066878 -0400
committer Tom Rini <trini@konsulko.com> 1428066878 -0400

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

Conflicts:
	board/armltd/vexpress64/vexpress64.c

Signed-off-by: Tom Rini <trini@konsulko.com>