Merge branch 'master' of /usr/src/ntfs-2.6/
Anton Altaparmakov [Thu, 19 Jan 2006 16:39:33 +0000 (16:39 +0000)]
1  2 
fs/ntfs/file.c

diff --cc fs/ntfs/file.c
Simple merge