]> 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: f15715a ff78aa2)
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@konsulko.com>
Sat, 4 Jun 2016 12:49:08 +0000 (08:49 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 4 Jun 2016 12:49:08 +0000 (08:49 -0400)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/dts/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/dts/Makefile
Simple merge
"Das U-Boot" Source Tree