projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a2376d d2944cf)
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)
commit622147fdad5425f6f572f84ce709303e5e0500b7
tree9b5adde02ed4481db2dc5011a2c9447c8cac12ebtree | snapshot
parent5a2376d1360bfc9ebf3b554dd8db1922d42cee4bcommit | diff
parentd2944cf21305c754fa8b2d6c1eea05ad5dad7944commit | diff
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 diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu.h diff1 | diff2 | blob | history
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c diff1 | diff2 | blob | history
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_atomic_helper.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_crtc.c diff1 | diff2 | blob | history
drivers/gpu/drm/drm_irq.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_drv.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_gem_gtt.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_gem_tiling.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_bios.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_display.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_dp_mst.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_uncore.c diff1 | diff2 | blob | history
drivers/gpu/drm/nouveau/nouveau_drm.c diff1 | diff2 | blob | history
include/drm/drmP.h diff1 | diff2 | blob | history
include/drm/drm_crtc_helper.h diff1 | diff2 | blob | history
include/uapi/drm/i915_drm.h diff1 | diff2 | blob | history
John Crispins staging tree