| commit | edd59b60be6cfe1016bf1aa7df3d9634b4c0ea54 | [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 | 239b5ff7c4ab1fc752cf009bdbee764710f86779 [diff] | |
| parent | a24859cbad6d8d7769dc8de55f469251e307f2cc [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