Merge git://git.denx.de/u-boot-imx

author Tom Rini <trini@konsulko.com>

Mon, 30 Apr 2018 11:14:05 +0000 (07:14 -0400)

committer Tom Rini <trini@konsulko.com>

Mon, 30 Apr 2018 11:14:05 +0000 (07:14 -0400)
author Tom Rini <trini@konsulko.com>
Mon, 30 Apr 2018 11:14:05 +0000 (07:14 -0400)
committer Tom Rini <trini@konsulko.com>
Mon, 30 Apr 2018 11:14:05 +0000 (07:14 -0400)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc board/armadeus/opos6uldev/board.c
Simple merge
diff --cc configs/mx7dsabresd_defconfig
Simple merge
author	Tom Rini <trini@konsulko.com>
	Mon, 30 Apr 2018 11:14:05 +0000 (07:14 -0400)
committer	Tom Rini <trini@konsulko.com>
	Mon, 30 Apr 2018 11:14:05 +0000 (07:14 -0400)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
board/armadeus/opos6uldev/board.c	patch \|	diff1 \|	diff2 \|	blob \| history
configs/mx7dsabresd_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history