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)
commitf2a630bfeccc87c3f89aaf8b4a8902f1e4e9f7ca
tree5c9f6950c1e8dc9190ab923c3c374db132fa1631
parent0f8c6d7ca9257d6a01671ab69b897860d3ae9bc0
parentc6afd658073f9fdb4cc80664dac71fa9db6fdf35
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