Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
authorSean Paul <seanpaul@chromium.org>
Tue, 27 Jun 2017 13:18:17 +0000 (09:18 -0400)
committerSean Paul <seanpaul@chromium.org>
Tue, 27 Jun 2017 13:18:17 +0000 (09:18 -0400)
Required for Daniel's drm_vblank_cleanup cleanup

21 files changed:
1  2 
Documentation/gpu/drm-internals.rst
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
drivers/gpu/drm/drm_atomic_helper.c
drivers/gpu/drm/drm_file.c
drivers/gpu/drm/drm_internal.h
drivers/gpu/drm/drm_ioctl.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/nouveau/nouveau_display.c
drivers/gpu/drm/nouveau/nouveau_drm.c
drivers/gpu/drm/nouveau/nv50_display.c
drivers/gpu/drm/qxl/qxl_display.c
drivers/gpu/drm/radeon/radeon_drv.c
drivers/gpu/drm/radeon/radeon_irq_kms.c
drivers/gpu/drm/tegra/drm.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
include/drm/drm_drv.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge