Skip to content
Commit 5b0d0fa7 authored by Keith Packard's avatar Keith Packard
Browse files

Merge commit 'anholt/drm-gem' into drm-gem 

Conflicts:

	linux-core/i915_gem.c
parents d59a9300 dafe48e6
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