Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Tue, 16 May 2017 00:16:02 +0000 (20:16 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 16 May 2017 00:16:02 +0000 (20:16 -0400)
1  2 
scripts/config_whitelist.txt

Simple merge