git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.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	5599617ec0719dba3b1f85a4abca2a6c93368ae3
tree	7d2f9bb6a538ee8ed5cfa391f2cfa72a3e2daa9f	tree \| snapshot
parent	8d19d7d9dbc25d1a1ffa602ed9eff25a88c98163	commit \| diff
parent	66fd7a66e8b9e11e49f46ea77910f935c4dee5c3	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>

Unnamed repository; edit this file 'description' to name the repository.

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