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)
commitace97d26176a3ebc9ec07738450de93eea35975c
tree7de5b3cdc2f269ae1426540ae9f74b420423f132
parent1692515e51a190b2ad1e2c54fdaa15fbb8387ba7
parent5ca269a4df21a7e326eb3b3f7788177d064fe782
Merge branch 'zynq' of git://denx.de/git/u-boot-microblaze
arch/arm/Kconfig
arch/arm/cpu/armv7/Makefile