Skip to content
Commit fb7ba211 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'korg/drm-fixes' into drm-vmware-next 

necessary for some of the vmware fixes to be pushed in.

Conflicts:
	drivers/gpu/drm/drm_gem.c
	drivers/gpu/drm/i915/intel_fb.c
	include/drm/drmP.h
parents 9a170cae abb295f3
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