Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 23 May 2014 20:50:23 +0000 (22:50 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 23 May 2014 20:50:23 +0000 (22:50 +0200)
1  2 
Makefile
include/configs/zynq-common.h

diff --cc Makefile
Simple merge
Simple merge