Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Fri, 1 Jun 2018 13:52:15 +0000 (09:52 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 1 Jun 2018 13:52:15 +0000 (09:52 -0400)
1  2 
cmd/Kconfig
scripts/config_whitelist.txt

diff --cc cmd/Kconfig
Simple merge
Simple merge