Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 24 Feb 2006 22:36:42 +0000 (14:36 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 24 Feb 2006 22:36:42 +0000 (14:36 -0800)

Trivial merge