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

Merge branch 'master' into crestline 

Conflicts:

	shared-core/i915_drm.h

Whitespace change only
parents 63c0f394 d0080d71
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