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

author Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

Wed, 28 Nov 2007 15:56:37 +0000 (00:56 +0900)

committer Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

Wed, 28 Nov 2007 15:56:37 +0000 (00:56 +0900)
author Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Wed, 28 Nov 2007 15:56:37 +0000 (00:56 +0900)
committer Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Wed, 28 Nov 2007 15:56:37 +0000 (00:56 +0900)
diff --cc Makefile
Simple merge
diff --cc common/cmd_bootm.c
Simple merge
diff --cc common/cmd_ide.c
Simple merge
author	Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
	Wed, 28 Nov 2007 15:56:37 +0000 (00:56 +0900)
committer	Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
	Wed, 28 Nov 2007 15:56:37 +0000 (00:56 +0900)
		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