Merge branch 'master' of git://www.denx.de/git/u-boot-dm
authorTom Rini <trini@konsulko.com>
Sun, 4 Dec 2016 00:43:51 +0000 (19:43 -0500)
committerTom Rini <trini@konsulko.com>
Sun, 4 Dec 2016 00:43:51 +0000 (19:43 -0500)
1  2 
Kconfig
include/configs/am335x_evm.h

diff --cc Kconfig
Simple merge
Simple merge