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
..
2006-11-30 18:02:20 +01:00
2006-11-30 18:02:20 +01:00
2006-11-30 18:02:20 +01:00
2006-11-30 18:02:20 +01:00
2006-11-30 18:02:20 +01:00
2006-11-30 18:02:20 +01:00
2006-11-30 18:02:20 +01:00
2006-10-20 15:54:48 -05:00
2006-11-30 01:54:07 +01:00
2006-11-23 22:58:58 +01:00