From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 7 Dec 2009 00:28:12 +0000 (-0800)
Subject: fix .31 patch that quilt mail didn't like
X-Git-Tag: v2.6.31.7~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a04545d7ba4fe016bfc77ff9de8491da71e025d5;p=thirdparty%2Fkernel%2Fstable-queue.git

fix .31 patch that quilt mail didn't like
---

diff --git a/queue-2.6.31/drm-i915-fix-irq-stall-issue-on-ironlake.patch b/queue-2.6.31/drm-i915-fix-irq-stall-issue-on-ironlake.patch
index f7790455c5e..57e4ad110c9 100644
--- a/queue-2.6.31/drm-i915-fix-irq-stall-issue-on-ironlake.patch
+++ b/queue-2.6.31/drm-i915-fix-irq-stall-issue-on-ironlake.patch
@@ -1,9 +1,9 @@
 From 2d109a845dd3074885db726892c629ab73dd0ed8 Mon Sep 17 00:00:00 2001
-From: Zou, Nanhai <nanhai.zou@intel.com>
+From: Nanhai Zou <nanhai.zou@intel.com>
 Date: Fri, 6 Nov 2009 02:13:01 +0000
 Subject: drm/i915: Fix IRQ stall issue on Ironlake
 
-From: Zou, Nanhai <nanhai.zou@intel.com>
+From: Nanhai Zou <nanhai.zou@intel.com>
 
 commit 2d109a845dd3074885db726892c629ab73dd0ed8 upstream.
 
@@ -11,7 +11,7 @@ The master irq control in DE must be disabled before irq handling,
 and enable after the process. This fixes the irq stall issue on
 Ironlake.
 
-Signed-off-by: Zou, Nanhai <nanhai.zou@intel.com>
+Signed-off-by: Nanhai Zou <nanhai.zou@intel.com>
 Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
 Signed-off-by: Eric Anholt <eric@anholt.net>
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>