Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 23 Jan 2011 17:24:26 +0000 (17:24 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 24 Jan 2011 23:45:32 +0000 (23:45 +0000)
commitbdd92c9ad287e03a2ec52f5a89c470cd5caae1c2
tree38d863507e900fb2ccac4c22fcf8934271c051b5
parenta37f2f87edc1b6e5932becf6e51535d36b690f2a
parent8e934dbf264418afe4d1dff34ce074ecc14280db
Merge branch 'drm-intel-fixes' into drm-intel-next

Merge important suspend and resume regression fixes and resolve the
small conflict.

Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_opregion.c
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/i915/intel_ringbuffer.h