]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 260eea5 8d4f040)
Merge git://www.denx.de/git/u-boot
authorNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Thu, 6 Dec 2007 16:20:16 +0000 (01:20 +0900)
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>
Thu, 6 Dec 2007 16:20:16 +0000 (01:20 +0900)
Conflicts:

drivers/Makefile

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

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