Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
Linus Torvalds [Wed, 17 Aug 2005 21:56:22 +0000 (14:56 -0700)]

Trivial merge