tree 3281184f026cb79cee6c20fe29c994ba654cbbe4
parent df15315899c0641412bd54b29565a70b078a6ac8
parent 1bb95834bbcdc969e477a9284cf96c17a4c2616f
author Chris Wilson <chris@chris-wilson.co.uk> 1289803770 +0000
committer Chris Wilson <chris@chris-wilson.co.uk> 1289803770 +0000

Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/intel_ringbuffer.c