Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@konsulko.com>
Tue, 12 Sep 2017 16:02:50 +0000 (12:02 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 12 Sep 2017 16:02:50 +0000 (12:02 -0400)
1  2 
arch/arm/dts/Makefile
scripts/config_whitelist.txt

Simple merge
Simple merge