projects / project / bcm63xx / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68489ed 543049a)
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Thu, 24 Jan 2019 20:30:48 +0000 (15:30 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 24 Jan 2019 20:30:48 +0000 (15:30 -0500)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/dts/Makefile patch | diff1 | diff2 | blob | history
scripts/config_whitelist.txt patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc scripts/config_whitelist.txt
Simple merge
Broadcom-s U-Boot