Module Name: src Committed By: cegger Date: Wed Dec 7 13:15:47 UTC 2011
Update of /cvsroot/src/sys/arch/xen/include/xen-public In directory ivanova.netbsd.org:/tmp/cvs-serv3955 Log Message: re-import xen3-public to rename this to xen-public Status: Vendor Tag: Xen Release Tags: xen-3_3_0 N src/sys/arch/xen/include/xen-public/COPYING N src/sys/arch/xen/include/xen-public/arch-ia64.h C src/sys/arch/xen/include/xen-public/arch-x86_32.h C src/sys/arch/xen/include/xen-public/arch-x86_64.h N src/sys/arch/xen/include/xen-public/callback.h C src/sys/arch/xen/include/xen-public/dom0_ops.h N src/sys/arch/xen/include/xen-public/domctl.h N src/sys/arch/xen/include/xen-public/elfnote.h N src/sys/arch/xen/include/xen-public/elfstructs.h C src/sys/arch/xen/include/xen-public/event_channel.h N src/sys/arch/xen/include/xen-public/features.h C src/sys/arch/xen/include/xen-public/grant_table.h N src/sys/arch/xen/include/xen-public/kexec.h N src/sys/arch/xen/include/xen-public/libelf.h N src/sys/arch/xen/include/xen-public/memory.h N src/sys/arch/xen/include/xen-public/nmi.h C src/sys/arch/xen/include/xen-public/physdev.h N src/sys/arch/xen/include/xen-public/platform.h N src/sys/arch/xen/include/xen-public/sched.h N src/sys/arch/xen/include/xen-public/sysctl.h C src/sys/arch/xen/include/xen-public/trace.h N src/sys/arch/xen/include/xen-public/vcpu.h C src/sys/arch/xen/include/xen-public/xen.h N src/sys/arch/xen/include/xen-public/version.h N src/sys/arch/xen/include/xen-public/xen-compat.h N src/sys/arch/xen/include/xen-public/xencomm.h N src/sys/arch/xen/include/xen-public/xenoprof.h N src/sys/arch/xen/include/xen-public/arch-ia64/debug_op.h N src/sys/arch/xen/include/xen-public/arch-ia64/sioemu.h N src/sys/arch/xen/include/xen-public/arch-ia64/hvm/memmap.h N src/sys/arch/xen/include/xen-public/arch-ia64/hvm/save.h N src/sys/arch/xen/include/xen-public/arch-x86/cpuid.h N src/sys/arch/xen/include/xen-public/arch-x86/xen-mca.h N src/sys/arch/xen/include/xen-public/arch-x86/xen-x86_32.h N src/sys/arch/xen/include/xen-public/arch-x86/xen-x86_64.h N src/sys/arch/xen/include/xen-public/arch-x86/xen.h N src/sys/arch/xen/include/xen-public/arch-x86/hvm/save.h N src/sys/arch/xen/include/xen-public/hvm/hvm_op.h N src/sys/arch/xen/include/xen-public/hvm/e820.h N src/sys/arch/xen/include/xen-public/hvm/hvm_info_table.h N src/sys/arch/xen/include/xen-public/hvm/ioreq.h N src/sys/arch/xen/include/xen-public/hvm/params.h N src/sys/arch/xen/include/xen-public/hvm/save.h N src/sys/arch/xen/include/xen-public/hvm/vmx_assist.h C src/sys/arch/xen/include/xen-public/io/blkif.h N src/sys/arch/xen/include/xen-public/io/console.h N src/sys/arch/xen/include/xen-public/io/fbif.h N src/sys/arch/xen/include/xen-public/io/fsif.h N src/sys/arch/xen/include/xen-public/io/kbdif.h C src/sys/arch/xen/include/xen-public/io/netif.h N src/sys/arch/xen/include/xen-public/io/pciif.h N src/sys/arch/xen/include/xen-public/io/protocols.h N src/sys/arch/xen/include/xen-public/io/ring.h N src/sys/arch/xen/include/xen-public/io/tpmif.h N src/sys/arch/xen/include/xen-public/io/xenbus.h N src/sys/arch/xen/include/xen-public/io/xs_wire.h N src/sys/arch/xen/include/xen-public/xsm/acm_ops.h N src/sys/arch/xen/include/xen-public/xsm/acm.h N src/sys/arch/xen/include/xen-public/xsm/flask_op.h 10 conflicts created by this import. Use the following command to help the merge: cvs checkout -jXen:yesterday -jXen src/sys/arch/xen/include/xen-public