]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19bde03 b0f20ca)
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@konsulko.com>
Wed, 27 Jan 2016 20:05:36 +0000 (15:05 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 27 Jan 2016 20:05:36 +0000 (15:05 -0500)
1  2 
arch/arm/dts/Makefile patch | diff1 | diff2 | blob | history
arch/powerpc/cpu/mpc85xx/cpu_init.c patch | diff1 | diff2 | blob | history
drivers/net/fsl-mc/mc.c patch | diff1 | diff2 | blob | history
include/configs/T4240RDB.h patch | diff1 | diff2 | blob | history

diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc arch/powerpc/cpu/mpc85xx/cpu_init.c
Simple merge
diff --cc drivers/net/fsl-mc/mc.c
Simple merge
diff --cc include/configs/T4240RDB.h
Simple merge
Cloned from git://git.denx.de/u-boot.git