From a22ddff8bedfe33eeb1330bbb7ef1fbe007a42c4 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 17 Aug 2012 08:57:56 +0200
Subject: Merge tag 'v3.6-rc2' into drm-intel-next
Git-commit: a22ddff8bedfe33eeb1330bbb7ef1fbe007a42c4
Patch-mainline: v3.7-rc1

Backmerge Linux 3.6-rc2 to resolve a few funny conflicts before we put
even more madness on top:

- drivers/gpu/drm/i915/i915_irq.c: Just a spurious WARN removed in
  -fixes, that has been changed in a variable-rename in -next, too.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Michal Srb <msrb@suse.com>
---
 drivers/gpu/drm/i915/i915_irq.c         |    1 -
 1 files changed, 0 insertions(+), 1 deletion(-)

--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -507,7 +507,6 @@ static void gen6_queue_rps_work(struct drm_i915_private *dev_priv,
 	 */
 
 	spin_lock_irqsave(&dev_priv->rps.lock, flags);
-	WARN(dev_priv->rps.pm_iir & pm_iir, "Missed a PM interrupt\n");
 	dev_priv->rps.pm_iir |= pm_iir;
 	I915_WRITE(GEN6_PMIMR, dev_priv->rps.pm_iir);
 	POSTING_READ(GEN6_PMIMR);
