]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5aa7bec 3f97af5)
Merge branch 'master' of git://git.denx.de/u-boot-imx
authorTom Rini <trini@ti.com>
Mon, 27 Oct 2014 13:08:42 +0000 (09:08 -0400)
committerTom Rini <trini@ti.com>
Mon, 27 Oct 2014 13:08:42 +0000 (09:08 -0400)
1  2 
arch/arm/cpu/armv7/mx6/soc.c patch | diff1 | diff2 | blob | history
arch/arm/lib/bootm.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/cpu/armv7/mx6/soc.c
Simple merge
diff --cc arch/arm/lib/bootm.c
Simple merge
Cloned from git://git.denx.de/u-boot.git