]> git.sur5r.net Git - u-boot/commit
Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@konsulko.com>
Wed, 12 Oct 2016 12:29:42 +0000 (08:29 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 12 Oct 2016 12:29:42 +0000 (08:29 -0400)
commit711b534120c0a5f73cdb9a25eb91f9aa0c5e09ab
tree4982ebe5c4ed6d1e28e110f17f2ca09e388d9ba1
parent8435179271106ec6fe9a9a5679b897755b1db8dd
parent76379dfb7e7e5092f32c79897bb58c19979e576b
Merge git://git.denx.de/u-boot-fsl-qoriq

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/ls1021aqds.h
include/configs/ls1021atwr.h
arch/arm/Kconfig
include/configs/ls1012a_common.h
include/configs/ls1021aqds.h
include/configs/ls1021atwr.h
include/configs/ls1043aqds.h
include/configs/ls1046aqds.h
include/configs/ls2080a_common.h
scripts/config_whitelist.txt