]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
projects / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b09ece0 f7d4d9e)
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
authorTom Rini <trini@konsulko.com>
Sat, 8 Apr 2017 13:28:02 +0000 (09:28 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 8 Apr 2017 13:28:02 +0000 (09:28 -0400)
1  2 
common/Kconfig patch | diff1 | diff2 | blob | history
include/configs/sunxi-common.h patch | diff1 | diff2 | blob | history

diff --cc common/Kconfig
Simple merge
diff --cc include/configs/sunxi-common.h
Simple merge
My U-Boot fork