Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 26 Jul 2014 12:08:36 +0000 (14:08 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 26 Jul 2014 12:08:36 +0000 (14:08 +0200)

Trivial merge