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)
commitc534d2fdcf7aa80230a0f1ed54d5e3164ba595eb
tree7c00728aa9d0c4cecf2d9203eebc093dbebbc07a
parent10dc77716f41979e03baf3b847b97dc7279ef30d
parent9f9d41bad16efe0674257b4efe4db1a399f93643
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
Makefile
include/configs/zynq-common.h