]> git.sur5r.net Git - u-boot/commit
projects / u-boot / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fb18fa9 2d83d33)
Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 3 Sep 2013 12:01:02 +0000 (14:01 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 3 Sep 2013 12:01:02 +0000 (14:01 +0200)
commit6d4511b2c6734842de9de21c1bc0db4c3ea28b72
treec676e6d3847b50f44f87afab50dc125fae6f1b84tree | snapshot
parentfb18fa95a14ae875ef0a5421cd9fecc00c7c3a4ccommit | diff
parent2d83d33a51926d6471eb9282d03d83783850d565commit | 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.
arch/arm/include/asm/arch-zynq/hardware.h diff1 | diff2 | blob | history
board/xilinx/zynq/board.c diff1 | diff2 | blob | history
Cloned from git://git.denx.de/u-boot.git