]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6dd10c a191cca)
Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@konsulko.com>
Fri, 18 Aug 2017 22:24:36 +0000 (18:24 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 18 Aug 2017 22:24:36 +0000 (18:24 -0400)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/dts/Makefile patch | diff1 | diff2 | blob | history
board/compulab/cm_fx6/cm_fx6.c patch | diff1 | diff2 | blob | history
common/splash_source.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc board/compulab/cm_fx6/cm_fx6.c
Simple merge
diff --cc common/splash_source.c
Simple merge
Cloned from git://git.denx.de/u-boot.git