Skip to content
Commit b9e68670 authored by Chris Wilson's avatar Chris Wilson
Browse files

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

Conflicts:
	drivers/gpu/drm/i915/intel_drv.h
parents 60de2ba5 5bddd17f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment