]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 7 Mar 2011 12:32:44 +0000 (12:32 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 7 Mar 2011 12:35:15 +0000 (12:35 +0000)
commitaffa58bcab8f15559d6cd247d7d574ebcad21870
treef5aceffc0bc82c8cc4d5e96ef73280b018a6f333
parent9f62a7c37c9d5429e406184d224b52e88a4429a8
parent410cb106e16285ffdff422dc232d8b10d7547f46
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