---

yaml --- r: 218328 b: refs/heads/master c: 139d363 h: refs/heads/master v: v3
git-mirror · Oct 19, 2010 · fde79f9 · fde79f9
1 parent 04bc8f5
commit fde79f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dde04b0152634d42994b34b86bbf3c70fbc6b19
+refs/heads/master: 139d363bcf2d995a72694ddd2b8665af6cb7fb54
diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/drivers/gpu/drm/i915/i915_irq.c
@@ -664,7 +664,7 @@ static void i915_capture_error_state(struct drm_device *dev)
 	}
 
 	/* We need to copy these to an anonymous buffer as the simplest
-	 * method to avoid being overwritten by userpace.
+	 * method to avoid being overwritten by userspace.
 	 */
 	error->batchbuffer[0] = i915_error_object_create(dev, batchbuffer[0]);
 	if (batchbuffer[1] != batchbuffer[0])