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

author Tom Rini <trini@konsulko.com>

Thu, 16 Mar 2017 20:44:23 +0000 (16:44 -0400)

committer Tom Rini <trini@konsulko.com>

Thu, 16 Mar 2017 20:44:23 +0000 (16:44 -0400)
author Tom Rini <trini@konsulko.com>
Thu, 16 Mar 2017 20:44:23 +0000 (16:44 -0400)
committer Tom Rini <trini@konsulko.com>
Thu, 16 Mar 2017 20:44:23 +0000 (16:44 -0400)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc drivers/net/zynq_gem.c
Simple merge
diff --cc scripts/config_whitelist.txt
Simple merge
author	Tom Rini <trini@konsulko.com>
	Thu, 16 Mar 2017 20:44:23 +0000 (16:44 -0400)
committer	Tom Rini <trini@konsulko.com>
	Thu, 16 Mar 2017 20:44:23 +0000 (16:44 -0400)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/zynq_gem.c	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/config_whitelist.txt	patch \|	diff1 \|	diff2 \|	blob \| history