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

..

bootp.c

Minor code cleanup.

2006-10-12 00:01:08 +02:00

bootp.h

…

eth.c

Fix the confilcts when merging 'master' into hpc2.

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

Makefile

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

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

net.c

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

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

nfs.c

Fix return code of NFS command

2005-08-06 01:11:12 +02:00

nfs.h

* Patch by Steven Scholz, 25 Feb 2004:

2004-02-27 00:07:27 +00:00

rarp.c

Patches by Pantelis Antoniou, 30 Mar 2004:

2004-04-15 21:48:45 +00:00

rarp.h

…

sntp.c

Fix problems with SNTP support;

2005-04-02 22:37:54 +00:00

sntp.h

* Patch by Masami Komiya, 30 Mar 2005:

2005-04-01 00:25:43 +00:00

tftp.c

Fix typo.

2006-08-14 22:43:13 +02:00

tftp.h

…