projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bc079e8 fa389e2)
Merge tag 'v3.14-rc6' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 10 Mar 2014 20:43:46 +0000 (21:43 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 10 Mar 2014 20:43:46 +0000 (21:43 +0100)
commite8e6e6012d68c4967e8f26fdd39ac95c247d4789
tree6b88dfc219ad811a564e81e9c2219dd5cd1b0fa4tree | snapshot
parentbc079e8b1684e1de505ec06f8c2339ae60a329e8commit | diff
parentfa389e220254c69ffae0d403eac4146171062d08commit | diff
Merge tag 'v3.14-rc6' into drm-intel-next-queued

Linux 3.14-rc6

I need the hdmi/dvi-dual link fixes in 3.14 to avoid ugly conflicts
when merging Ville's new hdmi cloning support into my -next tree

Conflicts:
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/intel_dp.c

Makefile cleanup conflicts with an acpi build fix, intel_dp.c is
trivial.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
14 files changed:
drivers/gpu/drm/i915/Makefile 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_gem_gtt.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_gpu_error.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/i915_irq.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_hdmi.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_panel.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_pm.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_ringbuffer.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_ringbuffer.h diff1 | diff2 | blob | history
include/drm/drm_crtc.h diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git