summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-22 17:55:56 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-22 17:55:56 +0100
commitc8fefb1bb4b38607d305c7e9ef55f146c9c628cb (patch)
treecb61e947055b5332b3c1124dcce888a039444b05 /Documentation
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha... (diff)
parentNTFS: Forgot to bump version number in makefile to 2.1.28... (diff)
downloadlinux-c8fefb1bb4b38607d305c7e9ef55f146c9c628cb.tar.xz
linux-c8fefb1bb4b38607d305c7e9ef55f146c9c628cb.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6: NTFS: Forgot to bump version number in makefile to 2.1.28... NTFS: 2.1.28 - Fix deadlock reported by Sergey Vlasov due to ntfs_put_inode().
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/ntfs.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt
index 13ba649bda75..81779068b09b 100644
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
@@ -457,6 +457,8 @@ ChangeLog
Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog.
+2.1.28:
+ - Fix a deadlock.
2.1.27:
- Implement page migration support so the kernel can move memory used
by NTFS files and directories around for management purposes.