]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eda3e1e f92edbd)
Merge git://www.denx.de/git/u-boot
authorNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Wed, 28 Nov 2007 15:56:37 +0000 (00:56 +0900)
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Wed, 28 Nov 2007 15:56:37 +0000 (00:56 +0900)
Conflicts:

drivers/Makefile

1  2 
Makefile patch | diff1 | diff2 | blob | history
common/cmd_bootm.c patch | diff1 | diff2 | blob | history
common/cmd_ide.c patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc common/cmd_bootm.c
Simple merge
diff --cc common/cmd_ide.c
Simple merge
Cloned from git://git.denx.de/u-boot.git