| commit | 821560fd8e43eecc208c1c52ad24faadb6b52703 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Tue Jun 27 09:32:37 2017 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Tue Jun 27 09:32:37 2017 -0400 |
| tree | efb56bc170674d3a6680ca4d343888e9e84403c7 | |
| parent | b8a238f1376f16c387765107b9d7f62e4358dd48 [diff] | |
| parent | 65496a34835cb4c9547bd02dd15b018c333add9d [diff] |
Merge git://www.denx.de/git/u-boot-imx Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: include/configs/imx6qdl_icore_rqs.h include/configs/imx6ul_geam.h include/configs/imx6ul_isiot.h