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

author Stefan Roese <sr@denx.de>

Fri, 10 Aug 2007 18:33:06 +0000 (20:33 +0200)

committer Stefan Roese <sr@denx.de>

Fri, 10 Aug 2007 18:33:06 +0000 (20:33 +0200)
author Stefan Roese <sr@denx.de>
Fri, 10 Aug 2007 18:33:06 +0000 (20:33 +0200)
committer Stefan Roese <sr@denx.de>
Fri, 10 Aug 2007 18:33:06 +0000 (20:33 +0200)
diff --cc Makefile
Simple merge
diff --cc include/common.h
Simple merge
author	Stefan Roese <sr@denx.de>
	Fri, 10 Aug 2007 18:33:06 +0000 (20:33 +0200)
committer	Stefan Roese <sr@denx.de>
	Fri, 10 Aug 2007 18:33:06 +0000 (20:33 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/common.h	patch \|	diff1 \|	diff2 \|	blob \| history