]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5de62c4 5196a7a)
Merge branch 'master' of http://www.denx.de/git/u-boot
authorJon Loeliger <jdl@freescale.com>
Tue, 22 Aug 2006 15:17:59 +0000 (10:17 -0500)
committerJon Loeliger <jdl@freescale.com>
Tue, 22 Aug 2006 15:17:59 +0000 (10:17 -0500)
1  2 
Makefile patch | diff1 | diff2 | blob | history
include/common.h patch | diff1 | diff2 | blob | history

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