git.maquefel.me Git - linux.git/commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Wed, 21 May 2014 09:45:40 +0000 (11:45 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Wed, 21 May 2014 09:45:40 +0000 (11:45 +0200)
commit	d40d91876a58979374e39722399ee93e870a44c9
tree	0f88607146771ae496439a5089d7f1d4aea6594d	tree \| snapshot
parent	4fa62c890cea83f28c30e1d5dc8fc86f61210280	commit \| diff
parent	c5ab3bc07e252a32b170ab4797142ef117c367a0	commit \| diff

Merge branch 'topic/drm-vblank-rework' into drm-intel-next-queued

Pull in the drm vblank rework from Ville and me. drm core parts acked
by Dave Airlie

Conflicts:
drivers/gpu/drm/i915/intel_display.c

Just a bit of fun around the placement of drm_vblank_on. This merge
resolution has been tested in drm-intel-nightly for a while already.

Acked-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

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