Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 1 Nov 2005 16:30:05 +0000 (08:30 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 1 Nov 2005 16:30:05 +0000 (08:30 -0800)

Trivial merge