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
arch/arm/Kconfig

diff --cc MAINTAINERS
Simple merge
Simple merge