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

Merge branch 'origin' into modesetting-101 

Conflicts:

	linux-core/drmP.h
	shared-core/i915_dma.c
	shared-core/i915_drm.h
	shared-core/radeon_drv.h
parents 8fd8bf59 5dc5c36e
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