| commit | 99777bd2171b09415ab7fcfbeaff43abe99f8219 | [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 | e0b027434b460edea886c52c080a4f98ef87c042 [diff] | |
| parent | f97e60262e9c22759bcc351602f09d8f08c38de6 [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