Module Name:	src
Committed By:	bouyer
Date:		Sun Sep 23 16:19:40 UTC 2007

Modified Files:
	src/sys/arch/xen/include/xen3-public: arch-ia64.h arch-x86_32.h
	    arch-x86_64.h dom0_ops.h event_channel.h grant_table.h memory.h
	    physdev.h sched.h trace.h vcpu.h version.h xen.h
	src/sys/arch/xen/include/xen3-public/io: blkif.h console.h netif.h
	    ring.h tpmif.h xenbus.h xs_wire.h
Removed Files:
	src/sys/arch/xen/include/xen3-public: sched_ctl.h

Log Message:
Merge conflics after import of Xen 3.1.0 public headers


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 src/sys/arch/xen/include/xen3-public/arch-ia64.h \
    src/sys/arch/xen/include/xen3-public/arch-x86_64.h \
    src/sys/arch/xen/include/xen3-public/dom0_ops.h \
    src/sys/arch/xen/include/xen3-public/event_channel.h \
    src/sys/arch/xen/include/xen3-public/memory.h \
    src/sys/arch/xen/include/xen3-public/physdev.h \
    src/sys/arch/xen/include/xen3-public/trace.h \
    src/sys/arch/xen/include/xen3-public/vcpu.h \
    src/sys/arch/xen/include/xen3-public/version.h
cvs rdiff -r1.4 -r1.5 src/sys/arch/xen/include/xen3-public/arch-x86_32.h \
    src/sys/arch/xen/include/xen3-public/grant_table.h \
    src/sys/arch/xen/include/xen3-public/sched.h \
    src/sys/arch/xen/include/xen3-public/xen.h
cvs rdiff -r1.3 -r0 src/sys/arch/xen/include/xen3-public/sched_ctl.h
cvs rdiff -r1.2 -r1.3 src/sys/arch/xen/include/xen3-public/io/blkif.h \
    src/sys/arch/xen/include/xen3-public/io/console.h
cvs rdiff -r1.3 -r1.4 src/sys/arch/xen/include/xen3-public/io/netif.h \
    src/sys/arch/xen/include/xen3-public/io/tpmif.h \
    src/sys/arch/xen/include/xen3-public/io/xenbus.h
cvs rdiff -r1.6 -r1.7 src/sys/arch/xen/include/xen3-public/io/ring.h
cvs rdiff -r1.4 -r1.5 src/sys/arch/xen/include/xen3-public/io/xs_wire.h

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