]> git.sur5r.net Git - u-boot/commit
Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@konsulko.com>
Fri, 25 Nov 2016 22:39:54 +0000 (17:39 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 25 Nov 2016 22:39:54 +0000 (17:39 -0500)
commited77ccd014b4073c4d282028cfb22f8d1742fec1
tree0d3cf0fd0e45bf10c7897a24f3560589f7740e20
parent136179bec19f4bc84227cba138214ea392a723ea
parent020198b0c7d251cf6bde76024ecf0ee711860534
Merge git://git.denx.de/u-boot-fsl-qoriq

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig