]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99615d8 4fb96c4)
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
authorTom Rini <trini@konsulko.com>
Wed, 12 Oct 2016 12:30:38 +0000 (08:30 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 12 Oct 2016 12:30:38 +0000 (08:30 -0400)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
include/configs/uniphier.h patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc include/configs/uniphier.h
Simple merge
Cloned from git://git.denx.de/u-boot.git