Merge commit '06d1ee32a4d25356a710b49d5e95dbdd68bdf505' of git://git.kernel.org/pub...
authorDave Airlie <airlied@redhat.com>
Fri, 16 Oct 2015 00:10:32 +0000 (10:10 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 16 Oct 2015 00:25:28 +0000 (10:25 +1000)
commit48f87dd146a480c723774962eca675873a8aa1da
tree71461989ebe8a20258ca4b0be341b755594a2b0b
parent6b62b3e134676687d5d666e6edc3b45f1507b2b7
parent06d1ee32a4d25356a710b49d5e95dbdd68bdf505
Merge commit '06d1ee32a4d25356a710b49d5e95dbdd68bdf505' of git://git./linux/kernel/git/torvalds/linux into drm-next

Backmerge the drm-fixes pull from Linus's tree into drm-next.

This is to fix some conflicts and make future pulls cleaner
20 files changed:
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/drm_sysfs.c
drivers/gpu/drm/exynos/exynos_drm_crtc.c
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/i915/intel_dp_mst.c
drivers/gpu/drm/i915/intel_lrc.c
drivers/gpu/drm/i915/intel_lrc.h
drivers/gpu/drm/i915/intel_runtime_pm.c
drivers/gpu/drm/nouveau/nouveau_display.c
drivers/gpu/drm/radeon/radeon_display.c
drivers/gpu/drm/radeon/radeon_kms.c
drivers/gpu/drm/radeon/radeon_mode.h
drivers/gpu/drm/radeon/radeon_pm.c
include/drm/drm_dp_helper.h