]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1692515 5ca269a)
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Wed, 29 Apr 2015 10:46:33 +0000 (06:46 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 29 Apr 2015 10:46:33 +0000 (06:46 -0400)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/cpu/armv7/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/cpu/armv7/Makefile
Simple merge
Cloned from git://git.denx.de/u-boot.git