diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-03 12:01:02 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-03 12:01:02 (GMT) |
| commit | 6d4511b2c6734842de9de21c1bc0db4c3ea28b72 (patch) | |
| tree | c676e6d3847b50f44f87afab50dc125fae6f1b84 /arch/arm/include/asm/omap_common.h | |
| parent | fb18fa95a14ae875ef0a5421cd9fecc00c7c3a4c (diff) | |
| parent | 2d83d33a51926d6471eb9282d03d83783850d565 (diff) | |
| download | u-boot-6d4511b2c6734842de9de21c1bc0db4c3ea28b72.tar.xz | |
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.
Diffstat (limited to 'arch/arm/include/asm/omap_common.h')
0 files changed, 0 insertions, 0 deletions