review.tizen.org Git - platform/kernel/linux-rpi3.git/commit

projects / platform / kernel / linux-rpi3.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cb8d50d 40d8670)

author	Jani Nikula <jani.nikula@intel.com>
	Wed, 18 Oct 2017 09:37:31 +0000 (12:37 +0300)
committer	Jani Nikula <jani.nikula@intel.com>
	Wed, 18 Oct 2017 09:37:31 +0000 (12:37 +0300)
commit	526b96c4f8dceb0104e267c61e5a3b22c538570c
tree	8825258c4f678f5ad9fddc0afaf72d640458481a	tree \| snapshot
parent	cb8d50dfb341e9615c8d203a3e6513dae9ff901d	commit \| diff
parent	40d86701a625eed9e644281b9af228d6a52d8ed9	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sprite.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel; Licenses: GPL-2.0;