Chris Wilson 47ae63e0c2 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

2011-03-07 12:35:15 +00:00

5.8 KiB

Raw Blame History

View Raw