git.ipfire.org Git - people/ms/u-boot.git/commit

]> git.ipfire.org Git - people/ms/u-boot.git/commit

projects / people / ms / u-boot.git / commit

author	Tom Rini <trini@konsulko.com>
	Sat, 4 Feb 2017 01:33:42 +0000 (20:33 -0500)
committer	Tom Rini <trini@konsulko.com>
	Sat, 4 Feb 2017 01:33:42 +0000 (20:33 -0500)
commit	c83a824e62277162ad35f52879b2316902c0eff5
tree	fa91cdcda24b8822d0f1e52786b2657e4d68be27	tree \| snapshot
parent	0ff27d4a94637d4b1937c625d33212375bd118d9	commit \| diff
parent	add63f94a9c3bbe1af3fdf3f4c56a5185a4c0504	commit \| 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

41 files changed:

README	diff1 \|	diff2 \|	blob \| history
configs/ls1012afrdm_qspi_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1012aqds_qspi_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1012ardb_qspi_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046aqds_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046aqds_lpuart_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046aqds_nand_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046aqds_qspi_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046aqds_sdcard_ifc_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046aqds_sdcard_qspi_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046ardb_emmc_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046ardb_qspi_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046ardb_sdcard_defconfig	diff1 \|	diff2 \|	blob \| history
include/configs/B4860QDS.h	diff1 \|	diff2 \|	blob \| history
include/configs/BSC9131RDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/BSC9132QDS.h	diff1 \|	diff2 \|	blob \| history
include/configs/C29XPCIE.h	diff1 \|	diff2 \|	blob \| history
include/configs/MPC8536DS.h	diff1 \|	diff2 \|	blob \| history
include/configs/MPC8569MDS.h	diff1 \|	diff2 \|	blob \| history
include/configs/MPC8572DS.h	diff1 \|	diff2 \|	blob \| history
include/configs/P1010RDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/P1022DS.h	diff1 \|	diff2 \|	blob \| history
include/configs/P1023RDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/P2041RDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/T102xQDS.h	diff1 \|	diff2 \|	blob \| history
include/configs/T102xRDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/T1040QDS.h	diff1 \|	diff2 \|	blob \| history
include/configs/T104xRDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/T208xQDS.h	diff1 \|	diff2 \|	blob \| history
include/configs/T208xRDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/T4240RDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/UCP1020.h	diff1 \|	diff2 \|	blob \| history
include/configs/controlcenterd.h	diff1 \|	diff2 \|	blob \| history
include/configs/corenet_ds.h	diff1 \|	diff2 \|	blob \| history
include/configs/cyrus.h	diff1 \|	diff2 \|	blob \| history
include/configs/km/kmp204x-common.h	diff1 \|	diff2 \|	blob \| history
include/configs/ls1046aqds.h	diff1 \|	diff2 \|	blob \| history
include/configs/p1_p2_rdb_pc.h	diff1 \|	diff2 \|	blob \| history
include/configs/p1_twr.h	diff1 \|	diff2 \|	blob \| history
include/configs/t4qds.h	diff1 \|	diff2 \|	blob \| history
include/configs/xpedite550x.h	diff1 \|	diff2 \|	blob \| history

"Das U-Boot" Source Tree

RSS Atom

README	diff1 \|	diff2 \|	blob \| history
configs/ls1012afrdm_qspi_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1012aqds_qspi_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1012ardb_qspi_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046aqds_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046aqds_lpuart_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046aqds_nand_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046aqds_qspi_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046aqds_sdcard_ifc_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046aqds_sdcard_qspi_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046ardb_emmc_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046ardb_qspi_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ls1046ardb_sdcard_defconfig	diff1 \|	diff2 \|	blob \| history
include/configs/B4860QDS.h	diff1 \|	diff2 \|	blob \| history
include/configs/BSC9131RDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/BSC9132QDS.h	diff1 \|	diff2 \|	blob \| history
include/configs/C29XPCIE.h	diff1 \|	diff2 \|	blob \| history
include/configs/MPC8536DS.h	diff1 \|	diff2 \|	blob \| history
include/configs/MPC8569MDS.h	diff1 \|	diff2 \|	blob \| history
include/configs/MPC8572DS.h	diff1 \|	diff2 \|	blob \| history
include/configs/P1010RDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/P1022DS.h	diff1 \|	diff2 \|	blob \| history
include/configs/P1023RDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/P2041RDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/T102xQDS.h	diff1 \|	diff2 \|	blob \| history
include/configs/T102xRDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/T1040QDS.h	diff1 \|	diff2 \|	blob \| history
include/configs/T104xRDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/T208xQDS.h	diff1 \|	diff2 \|	blob \| history
include/configs/T208xRDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/T4240RDB.h	diff1 \|	diff2 \|	blob \| history
include/configs/UCP1020.h	diff1 \|	diff2 \|	blob \| history
include/configs/controlcenterd.h	diff1 \|	diff2 \|	blob \| history
include/configs/corenet_ds.h	diff1 \|	diff2 \|	blob \| history
include/configs/cyrus.h	diff1 \|	diff2 \|	blob \| history
include/configs/km/kmp204x-common.h	diff1 \|	diff2 \|	blob \| history
include/configs/ls1046aqds.h	diff1 \|	diff2 \|	blob \| history
include/configs/p1_p2_rdb_pc.h	diff1 \|	diff2 \|	blob \| history
include/configs/p1_twr.h	diff1 \|	diff2 \|	blob \| history
include/configs/t4qds.h	diff1 \|	diff2 \|	blob \| history
include/configs/xpedite550x.h	diff1 \|	diff2 \|	blob \| history