Merge git://www.denx.de/git/u-boot

author Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

Thu, 6 Dec 2007 16:20:16 +0000 (01:20 +0900)

committer Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

Thu, 6 Dec 2007 16:20:16 +0000 (01:20 +0900)
author Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Thu, 6 Dec 2007 16:20:16 +0000 (01:20 +0900)
committer Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Thu, 6 Dec 2007 16:20:16 +0000 (01:20 +0900)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc common/cmd_ide.c
Simple merge
author	Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
	Thu, 6 Dec 2007 16:20:16 +0000 (01:20 +0900)
committer	Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
	Thu, 6 Dec 2007 16:20:16 +0000 (01:20 +0900)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
common/cmd_ide.c	patch \|	diff1 \|	diff2 \|	blob \| history