CVS commit: src/sys/arch/xen/include/xen-public

["Christoph Egger" <cegger%netbsd.org@localhost>]

Module Name:    src
Committed By:   cegger
Date:           Wed Dec  7 15:04:19 UTC 2011

Modified Files:
        src/sys/arch/xen/include/xen-public: event_channel.h grant_table.h
            physdev.h trace.h xen.h
        src/sys/arch/xen/include/xen-public/arch-x86: xen-x86_32.h
        src/sys/arch/xen/include/xen-public/io: blkif.h netif.h xs_wire.h

Log Message:
merge.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 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 -r1.10 -r1.11 src/sys/arch/xen/include/xen-public/xen.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
    src/sys/arch/xen/include/xen-public/arch-x86/xen-x86_32.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/xen/include/xen-public/io/blkif.h \
    src/sys/arch/xen/include/xen-public/io/netif.h
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/arch/xen/include/xen-public/io/xs_wire.h

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