projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb8d50d 40d8670)
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)
Needed for timer_setup() and drm_dev_{get,put}() conversions in i915.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1  2 
drivers/gpu/drm/i915/intel_display.c patch | diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_sprite.c patch | diff1 | diff2 | blob | history

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge
diff --cc drivers/gpu/drm/i915/intel_sprite.c
Simple merge
Domain: System / Kernel;