commit d5068656bd856eb97d6bb7b27de3d0ca8d8dda78
author roy zang <tie-fei.zang@freescale.com> Fri Dec 01 12:09:33 2006 +0800
committer Zang Tiefei <roy@bus.ap.freescale.net> Fri Dec 01 12:09:33 2006 +0800
tree 615986f2b3088072c49d74e1086650e185087698
parent 92dda87b91c96bf11723ef58dbd11bfa29adb6cc
parent 87b3d4b019a7440483a6a4b4b689c50bd53116a4

Fix the confilcts when merging 'master' into hpc2.
The conflicts due to a new mpc7448 p3m7448 board is in the main tree.

Merge branch 'master' into hpc2

Conflicts:

	MAKEALL
	cpu/74xx_7xx/cpu.c
	cpu/74xx_7xx/cpu_init.c
	cpu/74xx_7xx/speed.c

MAKEALL

diff --git a/MAKEALL b/MAKEALL
index 5aad6e7..fd78585 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -130,7 +130,7 @@
 #########################################################################
 
 LIST_83xx="	\
-	TQM834x		MPC8349EMDS					\
+	TQM834x		MPC8349EMDS	MPC8349ITX	MPC8360EMDS	\
 "
 
 
@@ -150,12 +150,14 @@
 #########################################################################
 
 LIST_74xx="	\
-	DB64360		DB64460		EVB64260	mpc7448hpc2	\
-	P3G4    	PCIPPC2		PCIPPC6		ZUMA		\
+	DB64360		DB64460		EVB64260	P3G4		\
+	p3m7448		PCIPPC2		PCIPPC6		ZUMA		\
+	mpc7448hpc2
 "
 
 LIST_7xx="	\
-	BAB7xx		CPCI750		ELPPC		ppmc7xx		\
+	BAB7xx		CPCI750		ELPPC		p3m750		\
+	ppmc7xx								\
 "
 
 LIST_ppc="${LIST_5xx}  ${LIST_5xxx}		\