]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5351a4 2e8dbe1)
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Mon, 4 Jun 2018 12:55:00 +0000 (08:55 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 4 Jun 2018 12:55:00 +0000 (08:55 -0400)
1  2 
arch/arm/dts/Makefile patch | diff1 | diff2 | blob | history
drivers/Kconfig patch | diff1 | diff2 | blob | history
drivers/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc drivers/Kconfig
Simple merge
diff --cc drivers/Makefile
Simple merge
Cloned from git://git.denx.de/u-boot.git