| commit | 6aee2ab68c362ace5a59f89a63abed82e0bf19e5 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Fri Sep 01 10:40:59 2017 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Fri Sep 01 10:40:59 2017 -0400 |
| tree | 0b76045a178e9c0ed61e141bd8dfb3e34e4e86a9 | |
| parent | 4109d702934c361b2ae2a5ad34f4dfee708cc214 [diff] | |
| parent | 63af4b0ad0666e0797306593813b6272e1995bde [diff] |
Merge git://git.denx.de/u-boot-imx Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: configs/imx6qdl_icore_mmc_defconfig configs/imx6qdl_icore_rqs_defconfig