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

diff --cc MAKEALL
index 5aad6e759400bda124995be75ce56ecbf29c1dac,74bf383aa73bc716ac8865f56b1a7111c6508d79..fd78585b9e93975cfbadccc1142130a73dbbe836
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -150,8 -150,8 +150,9 @@@ LIST_85xx="        
  #########################################################################
  
  LIST_74xx="   \
-       DB64360         DB64460         EVB64260        mpc7448hpc2     \
-       P3G4            PCIPPC2         PCIPPC6         ZUMA            \
+       DB64360         DB64460         EVB64260        P3G4            \
+       p3m7448         PCIPPC2         PCIPPC6         ZUMA            \
++      mpc7448hpc2
  "
  
  LIST_7xx="    \

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc cpu/74xx_7xx/cpu.c
Simple merge

diff --cc include/74xx_7xx.h
index 7cd2f10b018760a9e77f3a3b8c517be933575849,33e396a066c8ad0387f07a48d0ef9eccf91012df..8eccac8d592405182a63dbe127b15fb3a2531094
--- 1/include/74xx_7xx.h
--- 2/include/74xx_7xx.h
+++ b/include/74xx_7xx.h
@@@ -111,8 -111,8 +111,9 @@@ typedef enum __cpu_t 
        CPU_750CX, CPU_750FX, CPU_750GX,
        CPU_7400,
        CPU_7410,
+       CPU_7448,
        CPU_7450, CPU_7455, CPU_7457,
 +      CPU_7447A, CPU_7448,
        CPU_UNKNOWN} cpu_t;
  
  extern cpu_t get_cpu_type(void);

diff --cc include/asm-ppc/global_data.h
Simple merge

diff --cc net/eth.c
index c291f1908f7b774341f717b8b10f07e4ab526c9e,cca93920594b521b634c8315462b1518d4208350..44390d237b2f1386f8c8fd40ea1682e29b938224
--- 1/net/eth.c
--- 2/net/eth.c
+++ b/net/eth.c
@@@ -52,9 -52,9 +52,10 @@@ extern int rtl8139_initialize(bd_t*)
  extern int rtl8169_initialize(bd_t*);
  extern int scc_initialize(bd_t*);
  extern int skge_initialize(bd_t*);
 +extern int tsi108_eth_initialize(bd_t*);
  extern int tsec_initialize(bd_t*, int, char *);
  extern int npe_initialize(bd_t *);
+ extern int uec_initialize(int);
  
  static struct eth_device *eth_devices, *eth_current;