From: Dave Airlie <airlied@redhat.com>
Date: Fri, 20 May 2011 01:30:02 +0000 (+1000)
Subject: Merge remote branch 'keithp/drm-intel-next' of ../drm-next into drm-core-next
X-Git-Tag: v3.0-rc1~312^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=351fc4d660ff134fc33b920e1a3a97de4923dd91;p=~shefty%2Frdma-dev.git

Merge remote branch 'keithp/drm-intel-next' of ../drm-next into drm-core-next

* 'keithp/drm-intel-next' of ../drm-next:
  drm/i915: initialize gen6 rps work queue on Sandy Bridge and Ivy Bridge
  drm/i915/sdvo: Reorder i2c initialisation before ddc proxy
  drm/i915: FDI link training broken on Ironlake by Ivybridge integration
  drm/i915: enable rc6 by default
  drm/i915: add fbc enable flag, but disable by default
  drm/i915: clean up unused ring_get_irq/ring_put_irq functions
  drm/i915: fix user irq miss in BSD ring on g4x
---

351fc4d660ff134fc33b920e1a3a97de4923dd91