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

author Wolfgang Denk <wd@denx.de>

Sat, 18 Aug 2007 19:47:33 +0000 (21:47 +0200)

committer Wolfgang Denk <wd@denx.de>

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