From: Daniel Vetter 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-Tag: v4.8-rc1~62^2~41^2~3 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5599617ec0719dba3b1f85a4abca2a6c93368ae3;p=linux.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 --- 5599617ec0719dba3b1f85a4abca2a6c93368ae3