roy zang e0b369e4f7 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

2006-12-01 12:09:33 +08:00

..

bat_rw.c

Initial revision

2002-08-17 09:36:01 +00:00

board.c

Code cleanup.

2006-11-30 18:02:20 +01:00

cache.c

* Patch by Martin Winistoerfer, 23 Mar 2003

2003-03-31 17:27:09 +00:00

extable.c

General code modification for mpc7448hpc2 board support.

2006-11-02 18:49:51 +08:00

interrupts.c

* Cleanup lowboot code for MPC5200

2004-01-02 14:00:00 +00:00

kgdb.c

* Code cleanup:

2003-06-27 21:31:46 +00:00

Makefile

Move "ar" flags to config.mk to allow for silent "make -s"

2006-10-09 01:02:05 +02:00

ppcstring.S

Initial revision

2000-07-19 14:09:16 +00:00

ticks.S

Initial revision

2001-11-26 22:06:16 +00:00

time.c

* Code cleanup:

2003-06-27 21:31:46 +00:00