]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2659cfd729775a85dceff3249e8dc69baac7c997
tree38d863507e900fb2ccac4c22fcf8934271c051b5
parent081d09f5333aa0b600c3ed6cf8257a01bffa7659
parent09affd261cabe6d035f21548df7a850054f6b8b8
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