From: Sean Paul <seanpaul@chromium.org>
Date: Fri, 30 Mar 2018 16:35:45 +0000 (-0400)
Subject: Merge airlied/drm-next into drm-misc-next
X-Git-Tag: for-linus-20180616~70^2~21^2~87
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=83fd26c3f32afe38bb2ab8cc00e313ec5c2edbce;p=linux-block.git

Merge airlied/drm-next into drm-misc-next

Backmerging to pick up a fix from drm-misc-next-fixes.

Signed-off-by: Sean Paul <seanpaul@chromium.org>
---

83fd26c3f32afe38bb2ab8cc00e313ec5c2edbce