| commit | c83a824e62277162ad35f52879b2316902c0eff5 | [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 | 0ff27d4a94637d4b1937c625d33212375bd118d9 [diff] | |
| parent | add63f94a9c3bbe1af3fdf3f4c56a5185a4c0504 [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