projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 85a62bf 6fa2d19)
Merge tag 'drm-intel-next-fixes-2015-09-02' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 2 Sep 2015 12:33:42 +0000 (14:33 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 2 Sep 2015 12:33:42 +0000 (14:33 +0200)
commite93c28f39375558409329a02a767d5cadfcc4a31
tree9f1b4b5ce765b887b6002cded59fc934e6c9c012tree | snapshot (tar.gz zip)
parent85a62bf9d8ef8d533635270ae985281c58e8c974commit | diff
parent6fa2d197936ba0b8936e813d0adecefac160062bcommit | diff
Merge tag 'drm-intel-next-fixes-2015-09-02' into drm-intel-next-queued

Backmerge -fixes since there's more DDI-E related cleanups on top of
the pile of -fixes for skl that just landed for 4.3.

Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i914/intel_dp.c
drivers/gpu/drm/i915/intel_lrc.c

Conflicts are all fairly harmless adjacent line stuff.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
16 files changed:
drivers/gpu/drm/i915/Makefile diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_debugfs.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_drv.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_irq.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_reg.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_ddi.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_display.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_dp.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_dp_mst.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_drv.h diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_fbdev.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_hdmi.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_lrc.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_runtime_pm.c diff1 | diff2 | blob | history
include/drm/drm_dp_helper.h diff1 | diff2 | blob | history
Motorola kernel-slsi