From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 28 Mar 2017 08:02:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
X-Git-Tag: v4.12-rc1~116^2~13^2~34
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4adda532c05fa74602408cea319dcace884f7c67;p=karo-tx-linux.git

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Backmerge drm-next to get at -rc4, which we need to land the 4.12 gvt
patches.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---

4adda532c05fa74602408cea319dcace884f7c67