Module Name: src
Committed By: cegger
Date: Wed Dec 7 13:24:04 UTC 2011
Added Files:
src/sys/arch/xen/include/xen-public: arch-x86_32.h arch-x86_64.h
dom0_ops.h event_channel.h grant_table.h physdev.h trace.h xen.h
src/sys/arch/xen/include/xen-public/io: blkif.h netif.h
Log Message:
merge. The 'conflicts' happened because xen-public was once used for xen2
headers.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.5 src/sys/arch/xen/include/xen-public/arch-x86_32.h \
src/sys/arch/xen/include/xen-public/arch-x86_64.h \
src/sys/arch/xen/include/xen-public/dom0_ops.h \
src/sys/arch/xen/include/xen-public/event_channel.h \
src/sys/arch/xen/include/xen-public/grant_table.h \
src/sys/arch/xen/include/xen-public/physdev.h \
src/sys/arch/xen/include/xen-public/trace.h
cvs rdiff -u -r0 -r1.10 src/sys/arch/xen/include/xen-public/xen.h
cvs rdiff -u -r0 -r1.5 src/sys/arch/xen/include/xen-public/io/blkif.h \
src/sys/arch/xen/include/xen-public/io/netif.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
