Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze

author Tom Rini <[email protected]>

Wed, 29 Apr 2015 10:46:33 +0000 (06:46 -0400)

committer Tom Rini <[email protected]>

Wed, 29 Apr 2015 10:46:33 +0000 (06:46 -0400)
author Tom Rini <[email protected]>
Wed, 29 Apr 2015 10:46:33 +0000 (06:46 -0400)
committer Tom Rini <[email protected]>
Wed, 29 Apr 2015 10:46:33 +0000 (06:46 -0400)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/cpu/armv7/Makefile
Simple merge
author	Tom Rini <[email protected]>
	Wed, 29 Apr 2015 10:46:33 +0000 (06:46 -0400)
committer	Tom Rini <[email protected]>
	Wed, 29 Apr 2015 10:46:33 +0000 (06:46 -0400)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/cpu/armv7/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history