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

Merge Linus master into drm-next 


The merge is clean, but the arm build fails afterwards,
due to API changes in the regulator tree.

I've included the patch into the merge to fix the build.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents cec32a47 09d51602
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1442 additions and 93 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