Merge drm-upstream/drm-next into drm-intel-next-queued
authorJani Nikula <jani.nikula@intel.com>
Wed, 18 Oct 2017 09:37:31 +0000 (12:37 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 18 Oct 2017 09:37:31 +0000 (12:37 +0300)
commit526b96c4f8dceb0104e267c61e5a3b22c538570c
tree8825258c4f678f5ad9fddc0afaf72d640458481a
parentcb8d50dfb341e9615c8d203a3e6513dae9ff901d
parent40d86701a625eed9e644281b9af228d6a52d8ed9
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: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_sprite.c