---

yaml --- r: 293526 b: refs/heads/master c: f3953dc h: refs/heads/master v: v3
git-mirror · Jan 17, 2012 · 0fe11b7 · 0fe11b7
1 parent b0ea5d7
commit 0fe11b7
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: a7516a05311d0e2deb8ce8ae8b8c12a513ca8ca2
+refs/heads/master: f3953dcb98bad1c3badf451bcf41bf83ae2ce542
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -603,7 +603,7 @@ static int gen6_do_reset(struct drm_device *dev, u8 flags)
 }
 
 /**
- * i965_reset - reset chip after a hang
+ * i915_reset - reset chip after a hang
  * @dev: drm device to reset
  * @flags: reset domains
  *