Merge airlied/drm-next into drm-misc-fixes
authorSean Paul <seanpaul@chromium.org>
Mon, 16 Apr 2018 14:47:13 +0000 (10:47 -0400)
committerSean Paul <seanpaul@chromium.org>
Mon, 16 Apr 2018 14:47:13 +0000 (10:47 -0400)
Fast forwarding -fixes for 4.17.

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

Trivial merge