Merge remote-tracking branch 'drm/drm-next'

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/configs/exynos_defconfig
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
Simple merge

diff --cc drivers/gpu/drm/drm_crtc.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_userptr.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_lrc.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_ringbuffer.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_pm.c
Simple merge

diff --cc drivers/gpu/drm/virtio/virtgpu_fence.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
Simple merge

diff --cc sound/pci/hda/hda_intel.c
Simple merge