Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[pandora-kernel.git] / fs / dlm / lock.c

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 8122779..f71d0b5 100644 (file)
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -519,7 +519,7 @@ static void toss_rsb(struct kref *kref)
        }
 }
 
        }
 }
 

-/* When all references to the rsb are gone it's transfered to
+/* When all references to the rsb are gone it's transferred to

    the tossed list for later disposal. */
 
 static void put_rsb(struct dlm_rsb *r)
    the tossed list for later disposal. */
 
 static void put_rsb(struct dlm_rsb *r)