Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 16:55:56 +0000 (08:55 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 16:55:56 +0000 (08:55 -0800)
commitc8fefb1bb4b38607d305c7e9ef55f146c9c628cb
treecb61e947055b5332b3c1124dcce888a039444b05
parenta99d726bd0574991245fe7d38e8b11c41089eee4
parentbd62b23cbcc691cc8faa6f4028783f60957b6508
Merge git://git./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().