Merge airlied/drm-next into drm-misc-next
authorSean Paul <seanpaul@chromium.org>
Fri, 30 Mar 2018 16:35:45 +0000 (12:35 -0400)
committerSean Paul <seanpaul@chromium.org>
Fri, 30 Mar 2018 16:35:45 +0000 (12:35 -0400)
commit83fd26c3f32afe38bb2ab8cc00e313ec5c2edbce
treeb2d2719c998bc2bcba99f2ecf2d164ee9b7ad75a
parent4165791d29f64e01860a064f3c649447dbac41c3
parent694f54f680f7fd8e9561928fbfc537d9afbc3d79
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>
drivers/gpu/drm/tegra/drm.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
include/drm/drm_drv.h