Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / Documentation / filesystems / dlmfs.txt

diff --git a/Documentation/filesystems/dlmfs.txt b/Documentation/filesystems/dlmfs.txt
index 9afab845a906967acdc312df918e058015c33bed..c50bbb2d52b463a20165d05d5a0eeb5049c9a9a3 100644 (file)
--- a/Documentation/filesystems/dlmfs.txt
+++ b/Documentation/filesystems/dlmfs.txt
@@ -68,7 +68,7 @@ request for an already acquired lock will not generate another DLM
 call. Userspace programs are assumed to handle their own local
 locking.
 
 call. Userspace programs are assumed to handle their own local
 locking.
 

-Two levels of locks are supported - Shared Read, and Exlcusive.
+Two levels of locks are supported - Shared Read, and Exclusive.

 Also supported is a Trylock operation.
 
 For information on the libo2dlm interface, please see o2dlm.h,
 Also supported is a Trylock operation.
 
 For information on the libo2dlm interface, please see o2dlm.h,