Merge with /usr/src/ntfs-2.6.git
authorAnton Altaparmakov <aia21@cantab.net>
Wed, 25 May 2005 08:38:26 +0000 (09:38 +0100)
committerAnton Altaparmakov <aia21@cantab.net>
Wed, 25 May 2005 08:38:26 +0000 (09:38 +0100)

Trivial merge