Merge branch 'master' of git://git.denx.de/u-boot-nds32
authorTom Rini <trini@konsulko.com>
Mon, 22 May 2017 18:14:44 +0000 (14:14 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 22 May 2017 18:14:44 +0000 (14:14 -0400)
1  2 
arch/Kconfig

diff --cc arch/Kconfig
Simple merge