Merge branch 'drm-intel-fixes' into drm-intel-next
commit47ae63e0c2e5fdb582d471dc906eb29be94c732f
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 7 Mar 2011 12:32:44 +0000 (7 12:32 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 7 Mar 2011 12:35:15 +0000 (7 12:35 +0000)
treef5aceffc0bc82c8cc4d5e96ef73280b018a6f333
parentc59a333f73868ca6fbcecea99b3542e2c62a3a5c
parent467cffba85791cdfce38c124d75bd578f4bb8625
Merge branch 'drm-intel-fixes' into drm-intel-next

Apply the trivial conflicting regression fixes, but keep GPU semaphores
enabled.

Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_execbuffer.c
drivers/gpu/drm/i915/i915_gem_tiling.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_ringbuffer.h