summaryrefslogtreecommitdiffstats
path: root/Documentation/locks.txt
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-02-15 02:15:32 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-02-15 02:15:32 +0000
commit86464aed71025541805e7b1515541aee89879e33 (patch)
treee01a457a4912a8553bc65524aa3125d51f29f810 /Documentation/locks.txt
parent88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff)
Merge with Linux 2.2.1.
Diffstat (limited to 'Documentation/locks.txt')
-rw-r--r--Documentation/locks.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/locks.txt b/Documentation/locks.txt
index 91a016761..d2a797e0b 100644
--- a/Documentation/locks.txt
+++ b/Documentation/locks.txt
@@ -45,7 +45,7 @@ exists, and neither will have any effect on the other.
I wanted the two lock styles to be cooperative, but there were so many
race and deadlock conditions that the current solution was the only
practical one. It puts us in the same position as, for example, SunOS
-4.1.x and serveral other commercial Unices. The only OS's that support
+4.1.x and several other commercial Unices. The only OS's that support
cooperative flock()/fcntl() are those that emulate flock() using
fcntl(), with all the problems that implies.