]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
projects / people / ms / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa6365b 42f43aa)
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 patch | diff1 | diff2 | blob | history
scripts/config_whitelist.txt patch | diff1 | diff2 | blob | history

diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc scripts/config_whitelist.txt
Simple merge
"Das U-Boot" Source Tree