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

author Markus Klotzbuecher <mk@denx.de>

Mon, 7 May 2007 12:10:38 +0000 (14:10 +0200)

committer Markus Klotzbuecher <mk@pollux.denx.de>

Mon, 7 May 2007 12:10:38 +0000 (14:10 +0200)
author Markus Klotzbuecher <mk@denx.de>
Mon, 7 May 2007 12:10:38 +0000 (14:10 +0200)
committer Markus Klotzbuecher <mk@pollux.denx.de>
Mon, 7 May 2007 12:10:38 +0000 (14:10 +0200)
diff --cc CHANGELOG
Simple merge
diff --cc Makefile
Simple merge
diff --cc include/configs/delta.h
Simple merge
author	Markus Klotzbuecher <mk@denx.de>
	Mon, 7 May 2007 12:10:38 +0000 (14:10 +0200)
committer	Markus Klotzbuecher <mk@pollux.denx.de>
	Mon, 7 May 2007 12:10:38 +0000 (14:10 +0200)
		1	2
CHANGELOG	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/delta.h	patch \|	diff1 \|	diff2 \|	blob \| history