]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 1 Nov 2010 13:42:29 +0000 (13:42 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 1 Nov 2010 13:44:41 +0000 (13:44 +0000)
commitdd718a434fcfc941a79b2c2d701b0482585741ef
tree5c9f6950c1e8dc9190ab923c3c374db132fa1631
parente0a2ea97d23318ff0032a728e3350aca67760846
parent0ec70aff543f454fb86fe0ba1d7bf2e42d18f97a
Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_evict.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_evict.c
drivers/gpu/drm/i915/intel_overlay.c