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

author Stefan Roese <sr@denx.de>

Wed, 21 Mar 2007 13:38:25 +0000 (14:38 +0100)

committer Stefan Roese <sr@denx.de>

Wed, 21 Mar 2007 13:38:25 +0000 (14:38 +0100)
author Stefan Roese <sr@denx.de>
Wed, 21 Mar 2007 13:38:25 +0000 (14:38 +0100)
committer Stefan Roese <sr@denx.de>
Wed, 21 Mar 2007 13:38:25 +0000 (14:38 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc cpu/ppc4xx/start.S
Simple merge
author	Stefan Roese <sr@denx.de>
	Wed, 21 Mar 2007 13:38:25 +0000 (14:38 +0100)
committer	Stefan Roese <sr@denx.de>
	Wed, 21 Mar 2007 13:38:25 +0000 (14:38 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
cpu/ppc4xx/start.S	patch \|	diff1 \|	diff2 \|	blob \| history