| commit | a220f8ff6327e5a279a42c09438d926d076f7673 | [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 | a07e006cdb037433ccbff3c72a030ee00f5029d6 [diff] | |
| parent | 88d8f884b58f0753ad66ddcb9edfb8c0f5ba3cd1 [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