Merge tag 'xilinx-for-v2017.07' of git://www.denx.de/git/u-boot-microblaze

author Tom Rini <trini@konsulko.com>

Wed, 21 Jun 2017 11:57:37 +0000 (07:57 -0400)

committer Tom Rini <trini@konsulko.com>

Wed, 21 Jun 2017 11:57:37 +0000 (07:57 -0400)
author Tom Rini <trini@konsulko.com>
Wed, 21 Jun 2017 11:57:37 +0000 (07:57 -0400)
committer Tom Rini <trini@konsulko.com>
Wed, 21 Jun 2017 11:57:37 +0000 (07:57 -0400)
diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc configs/topic_miamiplus_defconfig
Simple merge
author	Tom Rini <trini@konsulko.com>
	Wed, 21 Jun 2017 11:57:37 +0000 (07:57 -0400)
committer	Tom Rini <trini@konsulko.com>
	Wed, 21 Jun 2017 11:57:37 +0000 (07:57 -0400)
		1	2
arch/arm/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
configs/topic_miamiplus_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history