Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
authorTom Rini <trini@ti.com>
Mon, 26 Jan 2015 11:42:15 +0000 (06:42 -0500)
committerTom Rini <trini@ti.com>
Mon, 26 Jan 2015 11:42:15 +0000 (06:42 -0500)
commit306df2c8241bd363c71a99841630fb5e85d81fae
treed2fda7cc2345460a5a852f2bdbd0f0a51095e7eb
parent03cae7261e00e0b36511625ed88f883187c17c77
parenta2425e6207d7c75906a15410f4c8c0a5d0519349
Merge branch 'zynq' of git://denx.de/git/u-boot-microblaze
arch/arm/cpu/armv7/zynq/spl.c
board/xilinx/zynq/board.c