Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'

author Albert ARIBAUD <albert.u.boot@aribaud.net>

Fri, 23 May 2014 20:50:23 +0000 (22:50 +0200)

committer Albert ARIBAUD <albert.u.boot@aribaud.net>

Fri, 23 May 2014 20:50:23 +0000 (22:50 +0200)
author Albert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 23 May 2014 20:50:23 +0000 (22:50 +0200)
committer Albert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 23 May 2014 20:50:23 +0000 (22:50 +0200)
diff --cc Makefile
Simple merge
diff --cc include/configs/zynq-common.h
Simple merge
author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Fri, 23 May 2014 20:50:23 +0000 (22:50 +0200)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Fri, 23 May 2014 20:50:23 +0000 (22:50 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/zynq-common.h	patch \|	diff1 \|	diff2 \|	blob \| history