Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 22 Nov 2013 09:19:35 +0000 (10:19 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 22 Nov 2013 09:19:35 +0000 (10:19 +0100)

Trivial merge