| commit | 863af892570af10a61af6ed286c42b69a145375e | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Fri Feb 03 20:33:42 2017 -0500 |
| committer | Tom Rini <trini@konsulko.com> | Fri Feb 03 20:33:42 2017 -0500 |
| tree | fa91cdcda24b8822d0f1e52786b2657e4d68be27 | |
| parent | 4c79ad0a7d259f72c4d34bcd8cbf7f6b8dfa78f7 [diff] | |
| parent | bedc5620fa82fea40d76f77d250a285fbdf2da92 [diff] |
Merge git://git.denx.de/u-boot-fsl-qoriq Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: configs/ls1046aqds_defconfig configs/ls1046aqds_nand_defconfig configs/ls1046aqds_qspi_defconfig configs/ls1046aqds_sdcard_ifc_defconfig configs/ls1046aqds_sdcard_qspi_defconfig configs/ls1046ardb_emmc_defconfig configs/ls1046ardb_qspi_defconfig configs/ls1046ardb_sdcard_defconfig