Merge with /usr/src/ntfs-2.6.git