git.dujemihanovic.xyz Git - u-boot.git/commit

]> git.dujemihanovic.xyz Git - u-boot.git/commit

projects / u-boot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ec1eaad 1c140f7)

author	Tom Rini <trini@konsulko.com>
	Fri, 28 Oct 2016 15:12:03 +0000 (11:12 -0400)
committer	Tom Rini <trini@konsulko.com>
	Fri, 28 Oct 2016 15:12:03 +0000 (11:12 -0400)
commit	4f892924d238cc415891dbea336a0fdaff2f853b
tree	145882227f01a5092c656d1fc7122adff76bc8c2	tree \| snapshot
parent	ec1eaad06551e2422baf8743f6987d4f561f2ce6	commit \| diff
parent	1c140f7bbf4a008fcd78b407ea80c60a2a18fc1f	commit \| diff

Merge branch 'master' of git://www.denx.de/git/u-boot-imx

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
common/Kconfig
configs/dms-ba16_defconfig

17 files changed:

arch/arm/dts/Makefile	diff1 \|	diff2 \|	blob \| history
common/Kconfig	diff1 \|	diff2 \|	blob \| history
configs/dms-ba16-1g_defconfig	diff1 \|	diff2 \|	blob \| history
configs/dms-ba16_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ge_b450v3_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ge_b650v3_defconfig	diff1 \|	diff2 \|	blob \| history
configs/ge_b850v3_defconfig	diff1 \|	diff2 \|	blob \| history
configs/zc5202_defconfig	diff1 \|	diff2 \|	blob \| history
include/configs/advantech_dms-ba16.h	diff1 \|	diff2 \|	blob \| history
include/configs/colibri_imx7.h	diff1 \|	diff2 \|	blob \| history
include/configs/ge_bx50v3.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx6sabresd.h	diff1 \|	diff2 \|	blob \| history
include/configs/mx7dsabresd.h	diff1 \|	diff2 \|	blob \| history
include/configs/tqma6_mba6.h	diff1 \|	diff2 \|	blob \| history
include/configs/tqma6_wru4.h	diff1 \|	diff2 \|	blob \| history
include/configs/zc5202.h	diff1 \|	diff2 \|	blob \| history
include/configs/zc5601.h	diff1 \|	diff2 \|	blob \| history

My U-Boot fork