| commit | 692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2 | [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 | 8a5c9ca4d0b8aa13a1bb321494d24f656a9a7d72 [diff] | |
| parent | 76a30fedd44428c7108084266389c9b4ba5678c8 [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>