Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes
authorSean Paul <seanpaul@chromium.org>
Tue, 20 Jun 2017 15:50:41 +0000 (11:50 -0400)
committerSean Paul <seanpaul@chromium.org>
Tue, 20 Jun 2017 15:50:41 +0000 (11:50 -0400)
commitb15cdca5b5de52dc2262c41917e8727b96b30fb0
treef61c45517b1763e40ebc1d2fbed3af906281ead5
parentd4e0045c4ed300781d2d4cbab57d05ed5e665a37
parent8c52f36413063bedbb3d31a65048a61ea2f1e169
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next-fixes

Backmerging airlied/drm-next
12 files changed:
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/radeon/cik.c
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/si.c
drivers/gpu/drm/rockchip/rockchip_drm_drv.h
drivers/gpu/drm/tegra/drm.c
drivers/gpu/host1x/dev.c