Skip to content
Commit c4b3a0f6 authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

Merge branch 'master' into pre-superioctl-branch 

Conflicts:

	linux-core/drm_bo.c
	linux-core/drm_fence.c
	linux-core/drm_objects.h
	shared-core/drm.h
parents 0774090d 03c47f14
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