]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
projects / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6841deb a877bec)
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
authorTom Rini <trini@ti.com>
Tue, 11 Nov 2014 21:59:44 +0000 (16:59 -0500)
committerTom Rini <trini@ti.com>
Tue, 11 Nov 2014 21:59:44 +0000 (16:59 -0500)
1  2 
arch/arm/dts/Makefile patch | diff1 | diff2 | blob | history
include/configs/socfpga_common.h patch | diff1 | diff2 | blob | history

diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc include/configs/socfpga_common.h
Simple merge
My U-Boot fork