]> git.hungrycats.org Git - linux/commitdiff
Merge flatcap.org:/home/flatcap/backup/bk/ntfs-2.6
authorRichard Russon <ntfs@flatcap.org>
Mon, 20 Sep 2004 10:24:11 +0000 (11:24 +0100)
committerRichard Russon <ntfs@flatcap.org>
Mon, 20 Sep 2004 10:24:11 +0000 (11:24 +0100)
into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6-devel

1  2 
fs/ntfs/inode.c
fs/ntfs/super.c

diff --cc fs/ntfs/inode.c
Simple merge
diff --cc fs/ntfs/super.c
Simple merge