Merge git://www.denx.de/git/u-boot into 2007_05_15-testing

author Markus Klotzbuecher <mk@denx.de>

Tue, 29 May 2007 14:37:57 +0000 (16:37 +0200)

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

Tue, 29 May 2007 14:37:57 +0000 (16:37 +0200)
author Markus Klotzbuecher <mk@denx.de>
Tue, 29 May 2007 14:37:57 +0000 (16:37 +0200)
committer Markus Klotzbuecher <mk@pollux.denx.de>
Tue, 29 May 2007 14:37:57 +0000 (16:37 +0200)
diff --cc Makefile
Simple merge
diff --cc README
Simple merge
diff --cc include/configs/IceCube.h
Simple merge
diff --cc include/configs/TQM5200.h
Simple merge
author	Markus Klotzbuecher <mk@denx.de>
	Tue, 29 May 2007 14:37:57 +0000 (16:37 +0200)
committer	Markus Klotzbuecher <mk@pollux.denx.de>
	Tue, 29 May 2007 14:37:57 +0000 (16:37 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/IceCube.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/TQM5200.h	patch \|	diff1 \|	diff2 \|	blob \| history