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

author Stefan Roese <sr@denx.de>

Sat, 24 Mar 2007 14:59:23 +0000 (15:59 +0100)

committer Stefan Roese <sr@denx.de>

Sat, 24 Mar 2007 14:59:23 +0000 (15:59 +0100)
author Stefan Roese <sr@denx.de>
Sat, 24 Mar 2007 14:59:23 +0000 (15:59 +0100)
committer Stefan Roese <sr@denx.de>
Sat, 24 Mar 2007 14:59:23 +0000 (15:59 +0100)
diff --cc board/amcc/sequoia/sequoia.c
Simple merge
diff --cc cpu/ppc4xx/start.S
Simple merge
diff --cc include/configs/acadia.h

index 9e02ca31b451a97a0fab51c87bfd943ff1376bf2,35b6a519e321c96faad81eeef44eca30073b1f3f..35b6a519e321c96faad81eeef44eca30073b1f3f

mode 100644,100755..100644
--- 1/include/configs/acadia.h
--- 2/include/configs/acadia.h
+++ b/include/configs/acadia.h
diff --cc include/ppc440.h
Simple merge
author	Stefan Roese <sr@denx.de>
	Sat, 24 Mar 2007 14:59:23 +0000 (15:59 +0100)
committer	Stefan Roese <sr@denx.de>
	Sat, 24 Mar 2007 14:59:23 +0000 (15:59 +0100)
		1	2
board/amcc/sequoia/sequoia.c	patch \|	diff1 \|	diff2 \|	blob \| history
cpu/ppc4xx/start.S	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/acadia.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/ppc440.h	patch \|	diff1 \|	diff2 \|	blob \| history