Skip to content
Commit 3e02f7fd authored by Kristian Høgsberg's avatar Kristian Høgsberg
Browse files

Merge commit 'origin/drm-gem' into ms-gem 

Conflicts:

	linux-core/drmP.h
	linux-core/drm_drv.c
	linux-core/drm_stub.c
	linux-core/i915_drv.c
	linux-core/i915_gem.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
parents 7fd8a5de d250a55f
Expand all 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