| commit | 6d4511b2c6734842de9de21c1bc0db4c3ea28b72 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Sep 03 14:01:02 2013 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue Sep 03 14:01:02 2013 +0200 |
| tree | c676e6d3847b50f44f87afab50dc125fae6f1b84 | |
| parent | fb18fa95a14ae875ef0a5421cd9fecc00c7c3a4c [diff] | |
| parent | 2d83d33a51926d6471eb9282d03d83783850d565 [diff] |
Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master' Conflicts: arch/arm/include/asm/arch-zynq/hardware.h The conflict above was trivial and solved during merge.