Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 25 Jun 2014 08:40:23 +0000 (10:40 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 25 Jun 2014 08:40:23 +0000 (10:40 +0200)

Trivial merge