Daniel Vetter 0654a65f26
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 >
2014-03-31 10:45:15 +02:00
2013-11-12 09:45:56 +05:30
2014-02-14 08:37:53 -08:00
2014-01-15 07:44:02 -05:00
2013-08-23 11:37:18 -07:00
2013-08-20 12:41:25 +02:00
2014-02-24 13:09:34 +01:00
2013-12-04 09:34:24 -04:00
2014-01-23 18:49:36 -08:00
2014-02-18 17:10:49 +05:30
2014-02-13 19:41:53 +00:00
2014-01-07 11:54:27 +09:00
2014-01-23 18:49:36 -08:00
2014-01-23 15:51:32 +01:00
2013-07-31 12:10:31 +02:00
2013-11-15 10:40:39 +01:00
2013-10-29 13:58:51 -07:00
2014-01-23 18:49:36 -08:00
2013-12-03 20:22:30 +00:00
2014-01-24 17:17:30 -08:00
2014-02-05 16:02:53 -08:00
2014-01-27 17:28:46 -08:00
2013-12-21 06:53:12 -02:00
2013-08-21 14:17:56 +01:00
2014-01-25 13:19:10 -08:00
2013-12-17 18:10:08 +01:00
2013-12-18 16:39:54 -08:00
2014-02-07 17:20:38 +01:00
2014-01-03 11:22:26 -08:00
2014-03-24 00:36:47 -04:00
2013-12-11 16:42:13 -07:00
2014-01-08 16:13:57 +01:00
2014-01-23 18:36:55 -08:00
2013-12-23 14:32:23 -06:00
2014-02-24 20:25:54 -08:00
2014-01-25 15:24:15 +04:00
2013-12-23 17:10:07 -08:00
2014-01-16 16:26:19 +00:00
2014-01-27 08:15:51 -08:00
2014-01-23 12:01:24 +00:00
2013-10-30 12:02:55 +08:00
2014-01-23 19:11:50 -08:00
2014-01-24 17:27:34 -08:00
2013-08-29 12:58:55 -07:00
2014-01-31 15:38:09 -08:00
2014-02-07 17:20:39 +01:00
2014-01-13 15:52:27 -08:00
2014-01-03 22:55:04 +08:00
2014-01-23 18:45:38 -08:00
2014-01-23 18:45:38 -08:00
2014-01-07 19:09:29 -06:00
2014-01-28 21:29:08 +01:00
2014-01-20 22:31:06 +00:00
2014-01-16 16:31:31 +00:00
2014-01-20 22:31:06 +00:00
2014-02-05 10:39:17 -06:00
0654a65f26