Merge with /home/stefan/git/u-boot/denx-merge-sr

author Stefan Roese <sr@denx.de>

Tue, 20 Feb 2007 09:58:04 +0000 (10:58 +0100)

committer Stefan Roese <sr@denx.de>

Tue, 20 Feb 2007 09:58:04 +0000 (10:58 +0100)
author Stefan Roese <sr@denx.de>
Tue, 20 Feb 2007 09:58:04 +0000 (10:58 +0100)
committer Stefan Roese <sr@denx.de>
Tue, 20 Feb 2007 09:58:04 +0000 (10:58 +0100)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc board/mpl/mip405/mip405.c
Simple merge
author	Stefan Roese <sr@denx.de>
	Tue, 20 Feb 2007 09:58:04 +0000 (10:58 +0100)
committer	Stefan Roese <sr@denx.de>
	Tue, 20 Feb 2007 09:58:04 +0000 (10:58 +0100)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
board/mpl/mip405/mip405.c	patch \|	diff1 \|	diff2 \|	blob \| history