Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <trini@konsulko.com>
Fri, 3 Apr 2015 13:14:38 +0000 (09:14 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 3 Apr 2015 13:14:38 +0000 (09:14 -0400)
commit692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2
treee47f18f7dd1507e91a46fcd6f550914ad3774f5a
parent8a5c9ca4d0b8aa13a1bb321494d24f656a9a7d72
parent76a30fedd44428c7108084266389c9b4ba5678c8
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>
board/armltd/vexpress64/vexpress64.c
include/configs/vexpress_aemv8a.h