| commit | 66669fcf809c1e3ff644b12e04e625d3737ffd8e | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Tue Jul 19 16:38:57 2016 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Tue Jul 19 16:38:57 2016 -0400 |
| tree | 362111f12b9dcf33eb31e165d882957df45fc896 | |
| parent | f60d0603edca472c4458b30956f38c6c1a836d66 [diff] | |
| parent | 0e68a3694d1f33c69be7d1cec5a4261aa1d3d01d [diff] |
Merge git://git.denx.de/u-boot-fsl-qoriq Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: arch/arm/cpu/armv8/Makefile arch/arm/lib/bootm-fdt.c