projects / oweals / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9af51fb 8097aee)
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@konsulko.com>
Wed, 8 Jan 2020 20:23:49 +0000 (15:23 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 8 Jan 2020 20:23:49 +0000 (15:23 -0500)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/dts/Makefile patch | diff1 | diff2 | blob | history
drivers/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc drivers/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.