| commit | 711b534120c0a5f73cdb9a25eb91f9aa0c5e09ab | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Wed Oct 12 08:29:42 2016 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Wed Oct 12 08:29:42 2016 -0400 |
| tree | 4982ebe5c4ed6d1e28e110f17f2ca09e388d9ba1 | |
| parent | 8435179271106ec6fe9a9a5679b897755b1db8dd [diff] | |
| parent | 76379dfb7e7e5092f32c79897bb58c19979e576b [diff] |
Merge git://git.denx.de/u-boot-fsl-qoriq Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: include/configs/ls1021aqds.h include/configs/ls1021atwr.h