Skip to content
Commit e1b8e797 authored by Eric Anholt's avatar Eric Anholt
Browse files

Merge branch 'drm-gem' 

Conflicts:

	shared-core/i915_dma.c

This brings in kernel support and userland interface for intel GEM.
parents 0c47151a 46e9274e
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