Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[mirror_ubuntu-artful-kernel.git] / include / linux / fence.h

diff --git a/include/linux/fence.h b/include/linux/fence.h
index d174585b874b926d77329d7e257e2b64a5d725b8..39efee130d2b01c3c45ed09e46e26734ec240be8 100644 (file)
--- a/include/linux/fence.h
+++ b/include/linux/fence.h
@@ -128,8 +128,8 @@ struct fence_cb {
  * from irq context, so normal spinlocks can be used.
  *
  * A return value of false indicates the fence already passed,
- * or some failure occured that made it impossible to enable
- * signaling. True indicates succesful enabling.
+ * or some failure occurred that made it impossible to enable
+ * signaling. True indicates successful enabling.
  *
  * fence->status may be set in enable_signaling, but only when false is
  * returned.