Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 16 Feb 2011 09:36:05 +0000 (09:36 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Wed, 16 Feb 2011 09:44:30 +0000 (09:44 +0000)
commit9035a97a32836d0e456ddafaaf249a844e6e4b5e
tree41ec3db083bdb46cd831f0d39db1fe294ae7d55f
parentfe16d949b45036d9f80e20e07bde1ddacc930b10
parent452858338aec31c1f4414bf07f31663690479869
Merge branch 'drm-intel-fixes' into drm-intel-next

Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.

Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_lvds.c
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/i915/intel_sdvo.c
drivers/gpu/drm/i915/intel_tv.c