Module Name:	othersrc
Committed By:	bad
Date:		Sun Feb 16 15:32:35 UTC 2003

Modified Files:
	othersrc/vmware-modules/source/vmmon: Makefile.linux
	othersrc/vmware-modules/source/vmmon/common: hostif.h memtrack.c
	    memtrack.h phystrack.c phystrack.h task.c task.h vmx86.c vmx86.h
	othersrc/vmware-modules/source/vmmon/include: initblock.h iocontrols.h
	    linux-version.h memmgmt.h modulecall.h speaker_reg.h taskswitch.h
	    vm_asm.h vm_assert.h vm_basic_types.h vm_time.h vm_types.h vtrace.h
	    x86.h
	othersrc/vmware-modules/source/vmmon/linux: driver.c hostif.c

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 othersrc/vmware-modules/source/vmmon/Makefile.linux
cvs rdiff -r1.3 -r1.4 othersrc/vmware-modules/source/vmmon/common/hostif.h
cvs rdiff -r1.2 -r1.3 othersrc/vmware-modules/source/vmmon/common/memtrack.c \
    othersrc/vmware-modules/source/vmmon/common/memtrack.h \
    othersrc/vmware-modules/source/vmmon/common/phystrack.c \
    othersrc/vmware-modules/source/vmmon/common/phystrack.h \
    othersrc/vmware-modules/source/vmmon/common/task.c \
    othersrc/vmware-modules/source/vmmon/common/task.h \
    othersrc/vmware-modules/source/vmmon/common/vmx86.h
cvs rdiff -r1.4 -r1.5 othersrc/vmware-modules/source/vmmon/common/vmx86.c
cvs rdiff -r1.2 -r1.3 \
    othersrc/vmware-modules/source/vmmon/include/initblock.h \
    othersrc/vmware-modules/source/vmmon/include/iocontrols.h \
    othersrc/vmware-modules/source/vmmon/include/memmgmt.h \
    othersrc/vmware-modules/source/vmmon/include/modulecall.h \
    othersrc/vmware-modules/source/vmmon/include/speaker_reg.h \
    othersrc/vmware-modules/source/vmmon/include/taskswitch.h \
    othersrc/vmware-modules/source/vmmon/include/vm_asm.h \
    othersrc/vmware-modules/source/vmmon/include/vm_assert.h \
    othersrc/vmware-modules/source/vmmon/include/vm_basic_types.h \
    othersrc/vmware-modules/source/vmmon/include/vm_time.h \
    othersrc/vmware-modules/source/vmmon/include/vm_types.h \
    othersrc/vmware-modules/source/vmmon/include/vtrace.h
cvs rdiff -r1.3 -r1.4 \
    othersrc/vmware-modules/source/vmmon/include/linux-version.h
cvs rdiff -r1.4 -r1.5 othersrc/vmware-modules/source/vmmon/include/x86.h
cvs rdiff -r1.3 -r1.4 othersrc/vmware-modules/source/vmmon/linux/driver.c \
    othersrc/vmware-modules/source/vmmon/linux/hostif.c

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