| commit | d40d91876a58979374e39722399ee93e870a44c9 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed May 21 11:45:40 2014 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed May 21 11:45:40 2014 +0200 |
| tree | 0f88607146771ae496439a5089d7f1d4aea6594d | |
| parent | 4fa62c890cea83f28c30e1d5dc8fc86f61210280 [diff] | |
| parent | c5ab3bc07e252a32b170ab4797142ef117c367a0 [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>