Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Sun, 15 Jan 2017 18:33:30 +0000 (13:33 -0500)
committerTom Rini <trini@konsulko.com>
Sun, 15 Jan 2017 18:33:30 +0000 (13:33 -0500)
1  2 
scripts/config_whitelist.txt

Simple merge