Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 31 Oct 2005 15:36:08 +0000 (07:36 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 31 Oct 2005 15:36:08 +0000 (07:36 -0800)

Trivial merge