Skip to content
Snippets Groups Projects
Commit 0abdca28 authored by Chris Wilson's avatar Chris Wilson :thinking:
Browse files

Merge remote-tracking branch 'drm-intel/drm-intel-next-queued' into drm-tip 

# Conflicts:
#	drivers/gpu/drm/i915/gem/i915_gem_pm.c
#	drivers/gpu/drm/i915/gt/intel_reset.c
#	drivers/gpu/drm/i915/i915_drv.c
#	drivers/gpu/drm/i915/i915_gem.c
#	drivers/gpu/drm/i915/i915_gem_gtt.c
parents b1fbd8a7 3cbad5d7
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2582 additions and 1937 deletions
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