]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
projects / people / ms / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8c1d5d ab10d73)
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@konsulko.com>
Fri, 24 Apr 2015 17:43:24 +0000 (13:43 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 24 Apr 2015 17:43:24 +0000 (13:43 -0400)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
common/spl/spl.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc common/spl/spl.c
Simple merge
"Das U-Boot" Source Tree