Hi,

This is a bad merge where you touched a lot of other files not
affected by the branch.

Bernd

On Wed, Oct 17, 2007 at 07:58:42PM +0000, Tim Rightnour wrote:
> 
> Module Name:	src
> Committed By:	garbled
> Date:		Wed Oct 17 19:58:41 UTC 2007
> 
> Modified Files:
> 	src/sys/arch: README
> 	src/sys/arch/acorn26/acorn26: cpuswitch.c db_interface.c genassym.cf
> 	    locore.S machdep.c pmap.c vm_machdep.c
> 	src/sys/arch/acorn26/conf: GENERIC
> 	src/sys/arch/acorn26/include: machdep.h types.h
> 	src/sys/arch/acorn26/ioc: if_eca.c
> 	src/sys/arch/acorn32/acorn32: autoconf.c hydra.c rpc_machdep.c
> 	src/sys/arch/acorn32/conf: GENERIC
> 	src/sys/arch/acorn32/eb7500atx: eb7500atx_machdep.c
> 	src/sys/arch/acorn32/include: cpu.h
> 	src/sys/arch/acorn32/mainbus: fd.c
> 	src/sys/arch/acorn32/podulebus: if_ie.c sbic.c
[..]

> Log Message:
> Merge the ppcoea-renovation branch to HEAD.