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
common/cmd_bootm.c
common/cmd_ide.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge