]> git.sur5r.net Git - u-boot/commitdiff
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
Makefile
common/cmd_ide.c

diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
Simple merge