projects / project / bcm63xx / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25ef4be 8bebf03)
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Mon, 7 Dec 2015 13:13:02 +0000 (08:13 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 7 Dec 2015 13:13:02 +0000 (08:13 -0500)
1  2 
include/configs/xilinx_zynqmp.h patch | diff1 | diff2 | blob | history
include/configs/xilinx_zynqmp_ep.h patch | diff1 | diff2 | blob | history

diff --cc include/configs/xilinx_zynqmp.h
Simple merge
diff --cc include/configs/xilinx_zynqmp_ep.h
Simple merge
Broadcom-s U-Boot