git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Thu, 27 Jul 2017 07:33:49 +0000 (09:33 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Thu, 27 Jul 2017 07:33:49 +0000 (09:33 +0200)
commit	5eb23ca96ce8bc88b571be377b238f72589fe270
tree	f1d484bb588a0739fda81db193325cf0c0d553ea	tree \| snapshot
parent	0f1c799580b3b41d7f1687766893d7732d1a07a2	commit \| diff
parent	b10c04e6cf4bbc6fcc147c04fbca0d946b26976e	commit \| diff

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

Resync with upstream to avoid git getting too badly confused. Also, we
have a conflict with the drm_vblank_cleanup removal, which cannot be
resolved by simply taking our side. Bake that in properly.

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

Linux Kernel Source Tree.

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/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_fbdev.c	diff1 \|	diff2 \|	blob \| history