Merge with /home/stefan/git/u-boot/denx

author Stefan Roese <sr@denx.de>

Fri, 10 Nov 2006 06:48:47 +0000 (07:48 +0100)

committer Stefan Roese <sr@denx.de>

Fri, 10 Nov 2006 06:48:47 +0000 (07:48 +0100)
author Stefan Roese <sr@denx.de>
Fri, 10 Nov 2006 06:48:47 +0000 (07:48 +0100)
committer Stefan Roese <sr@denx.de>
Fri, 10 Nov 2006 06:48:47 +0000 (07:48 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc common/Makefile
Simple merge
diff --cc cpu/ppc4xx/cpu.c
Simple merge
diff --cc include/ppc440.h
Simple merge
author	Stefan Roese <sr@denx.de>
	Fri, 10 Nov 2006 06:48:47 +0000 (07:48 +0100)
committer	Stefan Roese <sr@denx.de>
	Fri, 10 Nov 2006 06:48:47 +0000 (07:48 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
common/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
cpu/ppc4xx/cpu.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/ppc440.h	patch \|	diff1 \|	diff2 \|	blob \| history