Commit 567538aa authored by Archit Taneja's avatar Archit Taneja
Browse files

Merge remote-tracking branch 'danvet/topic/drm-misc' into for_srini_4.9_drm_msm 

Probably wrong amdgpu/intel conflict fixes. Revisit later.

Conflicts:
	drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
	drivers/gpu/drm/i915/intel_pm.c
parents bc33b0ca 4b514e10
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment