| commit | 0654a65f26d4b226c0b3e8a050db100200a6b924 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Mon Mar 31 10:40:13 2014 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Mon Mar 31 10:45:15 2014 +0200 |
| tree | 7b448b84cdc7ec0bbbd1ad6e9500eef94af0bfe8 | |
| parent | e1f23f3dd817f53f622e486913ac662add46eeed [diff] | |
| parent | 455c6fdbd219161bd09b1165f11699d6d73de11c [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>