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

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

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Thu, 2 Jun 2016 07:54:12 +0000 (09:54 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Thu, 2 Jun 2016 07:54:12 +0000 (09:54 +0200)
commit	7dcf411ded13a103566fbac9fb859dae89439183
tree	7d2f9bb6a538ee8ed5cfa391f2cfa72a3e2daa9f	tree \| snapshot
parent	9d304c4ca53a29c2bacffb700c8f65399a0ad956	commit \| diff
parent	46269b7cb96f315470bf3f5fd993d3b07e8f047f	commit \| diff

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Git got absolutely destroyed with all our cherry-picking from
drm-intel-next-queued to various branches. It ended up inserting
intel_crtc_page_flip 2x even in intel_display.c.

Backmerge to get back to sanity.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

Linux Kernel Source Tree.

RSS Atom

drivers/gpu/drm/i915/i915_dma.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_gem_execbuffer.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