From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu, 2 Jun 2016 07:54:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5599617ec0719dba3b1f85a4abca2a6c93368ae3;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

5599617ec0719dba3b1f85a4abca2a6c93368ae3