Module Name:	src
Committed By:	joerg
Date:		Fri Nov  2 13:34:51 UTC 2007

Modified Files:
	src/sys/arch/sandpoint/conf [jmcneill-pm]: GENERIC.NAS
	src/sys/arch/sandpoint/sandpoint [jmcneill-pm]: autoconf.c
Added Files:
	src/sys/arch/evbppc/pmppc [jmcneill-pm]: autoconf.c machdep.c mainbus.c
	    pic_cpc700.c pmppc_locore.S
	src/sys/arch/evbppc/pmppc/dev [jmcneill-pm]: cpc_mainbus.c ds17485.c
	    flash.c if_cs_mainbus.c mainbus.h
	src/sys/arch/evbppc/pmppc/pci [jmcneill-pm]: pci_machdep.c
	src/sys/arch/ofppc/isa [jmcneill-pm]: isa_machdep.c
	src/sys/arch/powerpc/pci [jmcneill-pm]: pchb.c pci_machdep_common.c
	    pcib.c pciconf_indirect.c
	src/sys/arch/powerpc/pic [jmcneill-pm]: files.ipi files.pic
	    i8259_common.c intr.c ipi.c ipi_openpic.c ipivar.h pic_i8259.c
	    pic_openpic.c pic_prepivr.c pic_soft.c picvar.h
	src/sys/arch/sandpoint/stand/netboot [jmcneill-pm]: entry.S newvers.sh

Log Message:
More diff reduce to HEAD due to botched up merging.


To generate a diff of this commit:
cvs rdiff -r0 -r1.1.6.1 src/sys/arch/evbppc/pmppc/autoconf.c \
    src/sys/arch/evbppc/pmppc/machdep.c src/sys/arch/evbppc/pmppc/mainbus.c \
    src/sys/arch/evbppc/pmppc/pic_cpc700.c \
    src/sys/arch/evbppc/pmppc/pmppc_locore.S
cvs rdiff -r0 -r1.1.6.1 src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c \
    src/sys/arch/evbppc/pmppc/dev/ds17485.c \
    src/sys/arch/evbppc/pmppc/dev/flash.c \
    src/sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c \
    src/sys/arch/evbppc/pmppc/dev/mainbus.h
cvs rdiff -r0 -r1.1.6.1 src/sys/arch/evbppc/pmppc/pci/pci_machdep.c
cvs rdiff -r0 -r1.1.6.1 src/sys/arch/ofppc/isa/isa_machdep.c
cvs rdiff -r0 -r1.1.6.1 src/sys/arch/powerpc/pci/pchb.c \
    src/sys/arch/powerpc/pci/pci_machdep_common.c \
    src/sys/arch/powerpc/pci/pcib.c \
    src/sys/arch/powerpc/pci/pciconf_indirect.c
cvs rdiff -r0 -r1.2.8.2 src/sys/arch/powerpc/pic/files.ipi \
    src/sys/arch/powerpc/pic/ipi.c src/sys/arch/powerpc/pic/ipi_openpic.c \
    src/sys/arch/powerpc/pic/ipivar.h
cvs rdiff -r0 -r1.1.6.1 src/sys/arch/powerpc/pic/files.pic \
    src/sys/arch/powerpc/pic/i8259_common.c src/sys/arch/powerpc/pic/intr.c \
    src/sys/arch/powerpc/pic/pic_i8259.c \
    src/sys/arch/powerpc/pic/pic_openpic.c \
    src/sys/arch/powerpc/pic/pic_prepivr.c \
    src/sys/arch/powerpc/pic/pic_soft.c src/sys/arch/powerpc/pic/picvar.h
cvs rdiff -r1.1.6.2 -r1.1.6.3 src/sys/arch/sandpoint/conf/GENERIC.NAS
cvs rdiff -r1.12.48.1 -r1.12.48.2 src/sys/arch/sandpoint/sandpoint/autoconf.c
cvs rdiff -r0 -r1.1.6.1 src/sys/arch/sandpoint/stand/netboot/entry.S \
    src/sys/arch/sandpoint/stand/netboot/newvers.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.