]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c956662 ba877ef)
Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Tue, 10 Feb 2015 15:42:56 +0000 (10:42 -0500)
committerTom Rini <trini@ti.com>
Tue, 10 Feb 2015 15:42:56 +0000 (10:42 -0500)
1  2 
Makefile patch | diff1 | diff2 | blob | history
arch/x86/include/asm/u-boot-x86.h patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc arch/x86/include/asm/u-boot-x86.h
Simple merge
Cloned from git://git.denx.de/u-boot.git