]> 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)
commit35e8f406e29ae7a5f4b87db34ede91ec4d01a437
tree8825258c4f678f5ad9fddc0afaf72d640458481a
parent05b997d82a0c4d5ea76b110d06bb426d4b88081b
parent549502b1629c4966f1df79c70b91d605f74c3930
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