git-history.diyao.me Git - linux/.git/commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Thu, 10 Aug 2017 16:12:01 +0000 (18:12 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Thu, 10 Aug 2017 16:12:01 +0000 (18:12 +0200)
commit	148b1e115eae37c9f3705691b4c45aa4cc0fa71d
tree	3f42609b3e7f53eb81830c976fadde1d7bc36a2c	tree \| snapshot
parent	3ec0af7f223bab9503c4ed57d00ed34b137df476	commit \| diff
parent	09ef2378dc42339f3871584dc26d27da220277cb	commit \| diff

Merge airlied/drm-next into drm-intel-next-queued

Ben Widawsky/Daniel Stone need the extended modifier support from
drm-misc to be able to merge CCS support for i915.ko

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

https://github.com/torvalds/linux.git

RSS Atom

drivers/gpu/drm/drm_atomic_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_fbdev.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_hdmi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sdvo.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_sprite.c	diff1 \|	diff2 \|	blob \| history