summaryrefslogtreecommitdiff
path: root/board/actux4
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-09-03 14:01:02 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-09-03 14:01:02 +0200
commit6d4511b2c6734842de9de21c1bc0db4c3ea28b72 (patch)
treec676e6d3847b50f44f87afab50dc125fae6f1b84 /board/actux4
parentfb18fa95a14ae875ef0a5421cd9fecc00c7c3a4c (diff)
parent2d83d33a51926d6471eb9282d03d83783850d565 (diff)
downloadu-boot-imx-6d4511b2c6734842de9de21c1bc0db4c3ea28b72.zip
u-boot-imx-6d4511b2c6734842de9de21c1bc0db4c3ea28b72.tar.gz
u-boot-imx-6d4511b2c6734842de9de21c1bc0db4c3ea28b72.tar.bz2
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 'board/actux4')
0 files changed, 0 insertions, 0 deletions