]> git.sur5r.net Git - u-boot/commitdiff
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
arch/arm/cpu/armv7/Makefile

Simple merge
Simple merge