Merge with /usr/src/ntfs-2.6.git
authorAnton Altaparmakov <aia21@cantab.net>
Sat, 21 May 2005 21:00:02 +0000 (22:00 +0100)
committerAnton Altaparmakov <aia21@cantab.net>
Sat, 21 May 2005 21:00:02 +0000 (22:00 +0100)

Trivial merge