Merge tag 'pull-24apr19' of git://git.denx.de/u-boot-dm

author Tom Rini <trini@konsulko.com>

Wed, 24 Apr 2019 16:27:29 +0000 (12:27 -0400)

committer Tom Rini <trini@konsulko.com>

Wed, 24 Apr 2019 16:27:29 +0000 (12:27 -0400)
author Tom Rini <trini@konsulko.com>
Wed, 24 Apr 2019 16:27:29 +0000 (12:27 -0400)
committer Tom Rini <trini@konsulko.com>
Wed, 24 Apr 2019 16:27:29 +0000 (12:27 -0400)
diff --cc cmd/Kconfig
Simple merge
diff --cc common/image-fdt.c
Simple merge
diff --cc include/pci.h
Simple merge
author	Tom Rini <trini@konsulko.com>
	Wed, 24 Apr 2019 16:27:29 +0000 (12:27 -0400)
committer	Tom Rini <trini@konsulko.com>
	Wed, 24 Apr 2019 16:27:29 +0000 (12:27 -0400)
		1	2
cmd/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
common/image-fdt.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/pci.h	patch \|	diff1 \|	diff2 \|	blob \| history