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

..

cache.S

* Patch by Jim Sandoz, 07 Nov 2002:

2002-11-11 21:14:20 +00:00

config.mk

* Code cleanup, mostly for GCC-3.3.x

2004-12-31 09:32:47 +00:00

cpu_init.c

[PATCH] Add support for Prodrive P3M750 & P3M7448 (P3Mx) boards

2006-11-29 16:14:05 +01:00

cpu.c

Fix the confilcts when merging 'master' into hpc2.

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

interrupts.c

* Patch by Gleb Natapov, 19 Sep 2003:

2003-12-06 19:49:23 +00:00

io.S

Initial revision

2002-01-15 18:58:11 +00:00

kgdb.S

* Patch by Yuli Barcohen, 19 Jul 2004:

2004-09-28 21:39:45 +00:00

Makefile

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

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

speed.c

Clean up the code according to codestyle:

2006-12-01 11:47:36 +08:00

start.S

[PATCH] Add support for Prodrive P3M750 & P3M7448 (P3Mx) boards

2006-11-29 16:14:05 +01:00

traps.c

GCC-4.x fixes: clean up global data pointer initialization for all boards.

2006-03-31 18:32:53 +02:00