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

Merge tag 'v4.6-rc7' into drm-next 

Merge this back as we've built up a fair few conflicts, and I have
some newer trees to pull in.
parents ba391646 44549e8f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment