| commit | c1a1955f7cae06db47905c5a60e0ac897ab30e3d | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Fri Apr 03 09:14:38 2015 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Fri Apr 03 09:14:38 2015 -0400 |
| tree | e47f18f7dd1507e91a46fcd6f550914ad3774f5a | |
| parent | b463048f88154c46a73f48a33e52c4608f6b8b11 [diff] | |
| parent | bdddbab263a6188a06fb7af4dcd133b0469c029a [diff] |
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>