Merge with /home/wd/git/u-boot/custodian/u-boot-coldfire

author Wolfgang Denk <wd@denx.de>

Sat, 18 Aug 2007 19:56:57 +0000 (21:56 +0200)

committer Wolfgang Denk <wd@denx.de>

Sat, 18 Aug 2007 19:56:57 +0000 (21:56 +0200)
author Wolfgang Denk <wd@denx.de>
Sat, 18 Aug 2007 19:56:57 +0000 (21:56 +0200)
committer Wolfgang Denk <wd@denx.de>
Sat, 18 Aug 2007 19:56:57 +0000 (21:56 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc include/common.h
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Sat, 18 Aug 2007 19:56:57 +0000 (21:56 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Sat, 18 Aug 2007 19:56:57 +0000 (21:56 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/common.h	patch \|	diff1 \|	diff2 \|	blob \| history