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

Merge branch 'master' into cleanup 

Conflicts:

	libdrm/xf86drm.c
	linux-core/drm_bo.c
	linux-core/drm_fence.c
parents 9b9a127e 694e1c5c
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