]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
projects / people / ms / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed78b11 84c7204)
Merge branch 'xnext/zynqmp' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Mon, 2 Mar 2015 18:22:12 +0000 (13:22 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 2 Mar 2015 18:22:12 +0000 (13:22 -0500)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/arm/Kconfig patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
"Das U-Boot" Source Tree