tree f5aceffc0bc82c8cc4d5e96ef73280b018a6f333
parent c59a333f73868ca6fbcecea99b3542e2c62a3a5c
parent 467cffba85791cdfce38c124d75bd578f4bb8625
author Chris Wilson <chris@chris-wilson.co.uk> 1299501164 +0000
committer Chris Wilson <chris@chris-wilson.co.uk> 1299501315 +0000

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