Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Sat, 8 Apr 2017 13:28:02 +0000 (09:28 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 8 Apr 2017 13:28:02 +0000 (09:28 -0400)
1  2 
common/Kconfig
include/configs/sunxi-common.h

diff --cc common/Kconfig
Simple merge
Simple merge