Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Mon, 7 Aug 2017 21:37:56 +0000 (17:37 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 7 Aug 2017 21:37:56 +0000 (17:37 -0400)
1  2 
scripts/config_whitelist.txt

Simple merge