Merge tag 'v4.2-rc7' into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 17 Aug 2015 04:13:53 +0000 (14:13 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 17 Aug 2015 04:13:53 +0000 (14:13 +1000)
commit4eebf60b7452fbd551fd7dece855ba7825a49cbc
tree490b4d194ba09c90e10201ab7fc084a0bda0ed27
parent8f9cb50789e76f3e224e8861adf650e55c747af4
parent2c6625cd545bdd66acff14f3394865d43920a5c7
Merge tag 'v4.2-rc7' into drm-next

Linux 4.2-rc7

Backmerge master for i915 fixes
18 files changed:
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu.h
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
drivers/gpu/drm/drm_atomic_helper.c
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_irq.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/intel_bios.c
drivers/gpu/drm/i915/intel_dp_mst.c
drivers/gpu/drm/i915/intel_uncore.c
drivers/gpu/drm/nouveau/nouveau_drm.c
drivers/gpu/drm/nouveau/nouveau_ttm.c
drivers/mfd/Kconfig
include/drm/drmP.h
include/drm/drm_crtc_helper.h
include/uapi/drm/i915_drm.h