Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...
authorDave Airlie <airlied@redhat.com>
Fri, 8 Jun 2012 08:42:35 +0000 (09:42 +0100)
committerDave Airlie <airlied@redhat.com>
Fri, 8 Jun 2012 08:42:35 +0000 (09:42 +0100)
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: pch_irq_handler -> {ibx, cpt}_irq_handler
  char/agp: add another Ironlake host bridge
  drm/i915: fix up ivb plane 3 pageflips
  drm/i915: hold forcewake around ring hw init
  drm/i915: Mark the ringbuffers as being in the GTT domain
  drm/i915/crt: Do not rely upon the HPD presence pin
  drm/i915: Reset last_retired_head when resetting ring

1  2 
drivers/gpu/drm/i915/i915_drv.h

Simple merge