]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'drm-intel-fixes-2015-08-14' into drm-intel-next-fixes
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 14 Aug 2015 16:10:35 +0000 (18:10 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 14 Aug 2015 16:11:30 +0000 (18:11 +0200)
commit9521a3394c6f99c22713b705309c4668126dd65e
tree9b5adde02ed4481db2dc5011a2c9447c8cac12eb
parent0a62d79ff6045840ef0474ba230779bc8994939a
parent9abf719f33f94eb1094f64d37b273fd27095567e
Merge tag 'drm-intel-fixes-2015-08-14' into drm-intel-next-fixes

Backmerge drm-intel-fixes because a bunch of atomic patch backporting
we had to do lead to horrible conflicts.

Conflicts:
drivers/gpu/drm/drm_crtc.c
Just a bit of context conflict between -next and -fixes.
drivers/gpu/drm/i915/intel_atomic.c
drivers/gpu/drm/i915/intel_display.c
Atomic conflicts, always pick the code from -next.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
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/i915_gem_tiling.c
drivers/gpu/drm/i915/intel_bios.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp_mst.c
drivers/gpu/drm/i915/intel_uncore.c
drivers/gpu/drm/nouveau/nouveau_drm.c
include/drm/drmP.h
include/drm/drm_crtc_helper.h
include/uapi/drm/i915_drm.h