From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Wed, 21 May 2014 09:45:40 +0000 (+0200)
Subject: Merge branch 'topic/drm-vblank-rework' into drm-intel-next-queued
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~44^2~38^2~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d40d91876a58979374e39722399ee93e870a44c9;p=pandora-kernel.git

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>
---

d40d91876a58979374e39722399ee93e870a44c9
Reading git-diff-tree failed