Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Fri, 28 Oct 2016 15:12:03 +0000 (11:12 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 28 Oct 2016 15:12:03 +0000 (11:12 -0400)
commit4f892924d238cc415891dbea336a0fdaff2f853b
tree145882227f01a5092c656d1fc7122adff76bc8c2
parentec1eaad06551e2422baf8743f6987d4f561f2ce6
parent1c140f7bbf4a008fcd78b407ea80c60a2a18fc1f
Merge branch 'master' of git://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
common/Kconfig
configs/dms-ba16-1g_defconfig
configs/dms-ba16_defconfig
configs/ge_b450v3_defconfig
configs/ge_b650v3_defconfig
configs/ge_b850v3_defconfig
configs/zc5202_defconfig
include/configs/advantech_dms-ba16.h
include/configs/colibri_imx7.h
include/configs/ge_bx50v3.h
include/configs/mx6sabresd.h
include/configs/mx7dsabresd.h
include/configs/tqma6_mba6.h
include/configs/tqma6_wru4.h
include/configs/zc5202.h
include/configs/zc5601.h