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

author Stefan Roese <sr@denx.de>

Thu, 16 Aug 2007 17:50:53 +0000 (19:50 +0200)

committer Stefan Roese <sr@denx.de>

Thu, 16 Aug 2007 17:50:53 +0000 (19:50 +0200)
author Stefan Roese <sr@denx.de>
Thu, 16 Aug 2007 17:50:53 +0000 (19:50 +0200)
committer Stefan Roese <sr@denx.de>
Thu, 16 Aug 2007 17:50:53 +0000 (19:50 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc board/esd/common/auto_update.c
Simple merge
author	Stefan Roese <sr@denx.de>
	Thu, 16 Aug 2007 17:50:53 +0000 (19:50 +0200)
committer	Stefan Roese <sr@denx.de>
	Thu, 16 Aug 2007 17:50:53 +0000 (19:50 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
board/esd/common/auto_update.c	patch \|	diff1 \|	diff2 \|	blob \| history