| commit | ec7483e34ea932fb68267dc0b1de30be51f271c9 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Wed Aug 02 10:52:26 2017 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Wed Aug 02 10:52:26 2017 -0400 |
| tree | 6120e2d0923962ec16cc757a22454bc942c90af4 | |
| parent | 07d778382200a05a8b86cc135f79ec48e386f25a [diff] | |
| parent | ec85721c8b94f9eb6807ebb15a223e4ec49a092a [diff] |
Merge git://git.denx.de/u-boot-fsl-qoriq Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: include/configs/ls1046aqds.h include/configs/ls1046ardb.h