Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Sep 2005 15:54:33 +0000 (08:54 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Sep 2005 15:54:33 +0000 (08:54 -0700)

Trivial merge