From: Daniel Vetter Date: Mon, 31 Mar 2014 08:40:13 +0000 (+0200) Subject: Merge tag 'v3.14' into drm-intel-next-queued X-Git-Tag: firefly_0821_release~176^2~3773^2~63^2~147 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=0654a65f26d4b226c0b3e8a050db100200a6b924;p=firefly-linux-kernel-4.4.55.git 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 --- 0654a65f26d4b226c0b3e8a050db100200a6b924