Merge tag 'master-2013-09-09' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[deliverable/linux.git] / Documentation / hwspinlock.txt

diff --git a/Documentation/hwspinlock.txt b/Documentation/hwspinlock.txt
index a903ee5e977643e945539d66d4e11e8c6354fb89..62f7d4ea6e26459b74cdccbca9f7a3532ab4900b 100644 (file)
--- a/Documentation/hwspinlock.txt
+++ b/Documentation/hwspinlock.txt
@@ -241,7 +241,7 @@ int hwspinlock_example2(void)
      locks).
      Should be called from a process context (this function might sleep).
      Returns the address of hwspinlock on success, or NULL on error (e.g.
-     if the hwspinlock is sill in use).
+     if the hwspinlock is still in use).
 
 5. Important structs