Merge git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Fri, 26 Jan 2018 18:22:40 +0000 (13:22 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 26 Jan 2018 18:22:40 +0000 (13:22 -0500)
1  2 
cmd/Kconfig
include/configs/sunxi-common.h

diff --cc cmd/Kconfig
Simple merge
Simple merge