Skip to content
Commit 526b96c4 authored by Jani Nikula's avatar Jani Nikula
Browse files

Merge drm-upstream/drm-next into drm-intel-next-queued 



Needed for timer_setup() and drm_dev_{get,put}() conversions in i915.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parents cb8d50df 40d86701
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