Skip to content
Snippets Groups Projects
Commit 51b44eb1 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'v3.18-rc4' into drm-next 

backmerge to get vmwgfx locking changes into next as the
conflict with per-plane locking.
parents cc7096fb 206c5f60
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 104 additions and 42 deletions
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