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

author Peter Pearse <peter.pearse@arm.com>

Fri, 18 May 2007 13:33:23 +0000 (14:33 +0100)

committer Peter Pearse <peter.pearse@arm.com>

Fri, 18 May 2007 13:33:23 +0000 (14:33 +0100)
author Peter Pearse <peter.pearse@arm.com>
Fri, 18 May 2007 13:33:23 +0000 (14:33 +0100)
committer Peter Pearse <peter.pearse@arm.com>
Fri, 18 May 2007 13:33:23 +0000 (14:33 +0100)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Peter Pearse <peter.pearse@arm.com>
	Fri, 18 May 2007 13:33:23 +0000 (14:33 +0100)
committer	Peter Pearse <peter.pearse@arm.com>
	Fri, 18 May 2007 13:33:23 +0000 (14:33 +0100)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history