projects / deliverable / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e1f23f3 455c6fd)
Merge tag 'v3.14' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 31 Mar 2014 08:40:13 +0000 (10:40 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 31 Mar 2014 08:45:15 +0000 (10:45 +0200)
commit0654a65f26d4b226c0b3e8a050db100200a6b924
tree7b448b84cdc7ec0bbbd1ad6e9500eef94af0bfe8tree | snapshot
parente1f23f3dd817f53f622e486913ac662add46eeedcommit | diff
parent455c6fdbd219161bd09b1165f11699d6d73de11ccommit | diff
Merge tag 'v3.14' into drm-intel-next-queued

Linux 3.14

The vt-d w/a merged late in 3.14-rc needs a bit of fine-tuning, hence
backmerge.

Conflicts:
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_dp.c

All trivial adjacent lines changed type conflicts, so trivial git
doesn't even show them in the merg commit.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_irq.c diff1 | diff2 | blob | history
drivers/gpu/drm/i915/intel_dp.c diff1 | diff2 | blob | history
drivers/gpu/drm/radeon/radeon_drv.c diff1 | diff2 | blob | history
drivers/gpu/drm/udl/udl_gem.c diff1 | diff2 | blob | history
fs/dcache.c diff1 | diff2 | blob | history
Linux kernel - Deliverables
This page took 0.040482 seconds and 5 git commands to generate.