Module Name:	syssrc
Committed By:	jdolecek
Date:		Mon Jul 26 14:02:33 UTC 1999

Modified Files:
	syssrc/sys/ntfs: ntfs.h ntfs_compr.c ntfs_compr.h ntfs_extern.h
	    ntfs_ihash.c ntfs_ihash.h ntfs_inode.h ntfs_subr.c ntfs_subr.h
	    ntfs_vfsops.c ntfs_vfsops.h ntfs_vnops.c ntfsmount.h

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 syssrc/sys/ntfs/ntfs.h syssrc/sys/ntfs/ntfs_compr.c \
    syssrc/sys/ntfs/ntfs_compr.h syssrc/sys/ntfs/ntfs_extern.h \
    syssrc/sys/ntfs/ntfs_ihash.c syssrc/sys/ntfs/ntfs_ihash.h \
    syssrc/sys/ntfs/ntfs_inode.h syssrc/sys/ntfs/ntfs_subr.h \
    syssrc/sys/ntfs/ntfs_vfsops.h syssrc/sys/ntfs/ntfsmount.h
cvs rdiff -r1.3 -r1.4 syssrc/sys/ntfs/ntfs_subr.c \
    syssrc/sys/ntfs/ntfs_vfsops.c syssrc/sys/ntfs/ntfs_vnops.c

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