Skip to content
Commit 44a22097 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'master' of ../../drm into modesetting-101 

Conflicts:

	shared-core/drm.h
parents e00dea81 d5c01012
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