| commit | 1994a35d5d5e54d70aeff0d4b0ac7795cc865628 | [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 | 94d95e417043dba7b5d230e946d7f6ad79adac81 [diff] | |
| parent | 716a1f91119a7dbd74a413be932e2fd195bc43fd [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