From 0fe11b74adb8c43a7b47136743fa938c306425e0 Mon Sep 17 00:00:00 2001
From: Eugeni Dodonov <eugeni.dodonov@intel.com>
Date: Mon, 28 Nov 2011 16:15:17 -0200
Subject: [PATCH] --- yaml --- r: 293526 b: refs/heads/master c:
 f3953dcb98bad1c3badf451bcf41bf83ae2ce542 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_drv.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 205cfef62d2f..5068c93cac4f 100644
--- 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
index 057c27225944..7578c08110f7 100644
--- 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
  *