]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb6ea03a38a606d3dd6546285824172438e37b312
tree8825258c4f678f5ad9fddc0afaf72d640458481a
parent1dd2cc818cfd22628be6498e985f023926af131b
parentb4b42f1e7a9c886d38106de9548c208c600af417
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