Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 15 Nov 2010 06:49:30 +0000 (06:49 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 15 Nov 2010 06:49:30 +0000 (06:49 +0000)
commitc94f28c383f58c9de74678e0f1624db9c5f8a8cb
tree3281184f026cb79cee6c20fe29c994ba654cbbe4
parentdf15315899c0641412bd54b29565a70b078a6ac8
parent1bb95834bbcdc969e477a9284cf96c17a4c2616f
Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_i2c.c