Module Name:	src
Committed By:	ad
Date:		Fri Oct 12 13:48:57 UTC 2007

Modified Files:
	src/sys/arch/amiga/conf [vmlocking]: AMIGA WSCONS
	src/sys/arch/i386/i386 [vmlocking]: genassym.cf
	src/sys/arch/mac68k/conf [vmlocking]: SMALLRAM
	src/sys/arch/xen/include/xen3-public [vmlocking]: arch-powerpc.h
	    callback.h domctl.h elfnote.h elfstructs.h kexec.h platform.h
	    sysctl.h xencomm.h xenoprof.h
	src/sys/arch/xen/include/xen3-public/hvm [vmlocking]: e820.h hvm_op.h
	    ioreq.h params.h save.h
	src/sys/arch/xen/include/xen3-public/io [vmlocking]: fbif.h protocols.h
	src/sys/dev/ic [vmlocking]: sl811hs.c vga.c vga_subr.c
	src/sys/dev/pci [vmlocking]: artsata.c
	src/sys/dev/pckbport [vmlocking]: pms.c
	src/sys/kern [vmlocking]: sys_pmc.c sys_process.c
	src/sys/netinet [vmlocking]: ip_gre.c
	src/sys/rump/fs/bin/fsconsole [vmlocking]: Makefile fsconsole.c
	src/sys/rump/fs/lib/libntfs [vmlocking]: Makefile
	src/sys/rump/fs/lib/libp2k [vmlocking]: Makefile p2k.c
	src/sys/rump/fs/lib/libukfs [vmlocking]: Makefile ukfs.c ukfs.h
	src/sys/rump/librump/rumpkern [vmlocking]: Makefile rump.h
Removed Files:
	src/sys/arch/i386/pci [vmlocking]: ichlpcib.c
	src/sys/arch/xen/x86 [vmlocking]: bus_space.c

Log Message:
Fix merge errors.


To generate a diff of this commit:
cvs rdiff -r1.102.8.2 -r1.102.8.3 src/sys/arch/amiga/conf/AMIGA
cvs rdiff -r1.56.8.3 -r1.56.8.4 src/sys/arch/amiga/conf/WSCONS
cvs rdiff -r1.48.4.7 -r1.48.4.8 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -r1.19 -r0 src/sys/arch/i386/pci/ichlpcib.c
cvs rdiff -r1.27.12.1 -r1.27.12.2 src/sys/arch/mac68k/conf/SMALLRAM
cvs rdiff -r1.2.6.2 -r1.2.6.3 \
    src/sys/arch/xen/include/xen3-public/arch-powerpc.h \
    src/sys/arch/xen/include/xen3-public/callback.h \
    src/sys/arch/xen/include/xen3-public/domctl.h \
    src/sys/arch/xen/include/xen3-public/elfnote.h \
    src/sys/arch/xen/include/xen3-public/elfstructs.h \
    src/sys/arch/xen/include/xen3-public/kexec.h \
    src/sys/arch/xen/include/xen3-public/platform.h \
    src/sys/arch/xen/include/xen3-public/sysctl.h \
    src/sys/arch/xen/include/xen3-public/xencomm.h \
    src/sys/arch/xen/include/xen3-public/xenoprof.h
cvs rdiff -r1.2.6.2 -r1.2.6.3 src/sys/arch/xen/include/xen3-public/hvm/e820.h \
    src/sys/arch/xen/include/xen3-public/hvm/hvm_op.h \
    src/sys/arch/xen/include/xen3-public/hvm/ioreq.h \
    src/sys/arch/xen/include/xen3-public/hvm/params.h \
    src/sys/arch/xen/include/xen3-public/hvm/save.h
cvs rdiff -r1.2.6.2 -r1.2.6.3 src/sys/arch/xen/include/xen3-public/io/fbif.h \
    src/sys/arch/xen/include/xen3-public/io/protocols.h
cvs rdiff -r1.8 -r0 src/sys/arch/xen/x86/bus_space.c
cvs rdiff -r1.11.8.2 -r1.11.8.3 src/sys/dev/ic/sl811hs.c
cvs rdiff -r1.92.2.2 -r1.92.2.3 src/sys/dev/ic/vga.c
cvs rdiff -r1.20 -r1.20.30.1 src/sys/dev/ic/vga_subr.c
cvs rdiff -r1.15 -r1.15.6.1 src/sys/dev/pci/artsata.c
cvs rdiff -r1.17.2.3 -r1.17.2.4 src/sys/dev/pckbport/pms.c
cvs rdiff -r1.7 -r1.7.6.1 src/sys/kern/sys_pmc.c
cvs rdiff -r1.123.2.5 -r1.123.2.6 src/sys/kern/sys_process.c
cvs rdiff -r1.44.8.2 -r1.44.8.3 src/sys/netinet/ip_gre.c
cvs rdiff -r1.2.2.2 -r1.2.2.3 src/sys/rump/fs/bin/fsconsole/Makefile
cvs rdiff -r1.4.2.3 -r1.4.2.4 src/sys/rump/fs/bin/fsconsole/fsconsole.c
cvs rdiff -r1.3.2.2 -r1.3.2.3 src/sys/rump/fs/lib/libntfs/Makefile
cvs rdiff -r1.3.2.3 -r1.3.2.4 src/sys/rump/fs/lib/libp2k/Makefile
cvs rdiff -r1.16.2.3 -r1.16.2.4 src/sys/rump/fs/lib/libp2k/p2k.c
cvs rdiff -r1.2.2.3 -r1.2.2.4 src/sys/rump/fs/lib/libukfs/Makefile
cvs rdiff -r1.5.2.3 -r1.5.2.4 src/sys/rump/fs/lib/libukfs/ukfs.c \
    src/sys/rump/fs/lib/libukfs/ukfs.h
cvs rdiff -r1.12.2.3 -r1.12.2.4 src/sys/rump/librump/rumpkern/Makefile
cvs rdiff -r1.12.2.2 -r1.12.2.3 src/sys/rump/librump/rumpkern/rump.h

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