From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 22 Jan 2007 16:55:56 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6
X-Git-Tag: v2.6.20-rc6~59
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c8fefb1bb4b38607d305c7e9ef55f146c9c628cb;p=linux-2.6-omap-h63xx.git

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().
---

c8fefb1bb4b38607d305c7e9ef55f146c9c628cb