Daniel Vetter ca6e440577
Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued ...
Backmerge fixes since it's getting out of hand again with the massive
split due to atomic between -next and 4.2-rc. All the bugfixes in
4.2-rc are addressed already (by converting more towards atomic
instead of minimal duct-tape) so just always pick the version in next
for the conflicts in modeset code.
All the other conflicts are just adjacent lines changed.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_ringbuffer.h
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com >
2015-07-15 16:36:50 +02:00
2015-07-01 18:55:34 -07:00
2015-06-19 01:14:15 +02:00
2015-07-09 15:08:44 -07:00
2015-06-02 16:31:33 +01:00
2015-05-07 09:35:14 -06:00
2015-03-20 07:41:56 -06:00
2015-06-25 17:00:36 -07:00
2015-06-26 19:50:04 -07:00
2015-04-14 16:49:00 -07:00
2015-06-24 20:01:36 -07:00
2015-03-09 21:06:18 +11:00
2015-06-17 12:40:40 -04:00
2015-07-09 15:38:16 -07:00
2015-06-25 09:21:58 +05:30
2015-07-15 16:36:50 +02:00
2015-04-21 09:42:58 -07:00
2015-06-03 12:59:38 +02:00
2015-07-04 19:36:06 -07:00
2015-06-24 20:01:36 -07:00
2015-04-10 22:22:56 +02:00
2015-07-03 14:39:05 +02:00
2015-06-25 18:42:39 -07:00
2015-06-22 10:14:05 -06:00
2015-07-01 16:26:08 +02:00
2015-06-08 16:43:09 -06:00
2015-06-22 09:56:07 -06:00
2015-06-08 16:42:07 -06:00
2015-07-01 19:09:11 -07:00
2015-06-26 14:51:15 -07:00
2015-06-25 17:00:38 -07:00
2015-06-25 17:00:39 -07:00
2015-06-08 23:15:45 +02:00
2015-06-26 11:23:38 -04:00
2015-04-18 11:10:49 -04:00
2015-07-07 01:18:11 +02:00
2015-06-19 17:10:28 +10:00
2015-06-22 09:59:28 -06:00
2015-06-22 16:05:04 -06:00
2015-06-24 20:01:36 -07:00
2015-05-18 12:14:17 -04:00
2015-05-19 08:39:21 +02:00
2015-06-25 15:22:36 -07:00
2015-06-02 11:53:42 -07:00
2015-06-12 17:39:51 -07:00
2015-06-09 17:23:00 +02:00
2015-04-17 09:04:12 -04:00
2015-06-25 17:00:43 -07:00
2015-07-04 14:13:43 -07:00
2015-05-11 19:46:52 -07:00
2015-02-26 11:57:29 -08:00
2015-05-13 15:39:04 -04:00
2015-06-26 15:59:26 -07:00
2015-06-22 16:04:57 -06:00
2015-06-09 18:43:47 -03:00
2015-06-05 17:26:39 +02:00
2015-06-25 17:00:37 -07:00
2015-05-24 12:08:59 -07:00
2015-07-01 16:43:17 +02:00
2015-07-02 11:08:50 +02:00
2015-06-24 20:01:36 -07:00
2015-02-26 11:57:31 -08:00
2015-05-13 12:32:51 -07:00
2015-02-27 11:44:24 -08:00
2015-05-07 17:07:41 -06:00
2015-03-05 13:37:01 +10:30
2015-05-27 15:22:15 +02:00
2015-06-22 10:14:05 -06:00
2015-06-24 20:01:36 -07:00
2015-05-29 17:21:45 -05:00
2015-04-21 14:47:16 +05:30
2015-06-24 18:17:40 +02:00
2015-03-20 07:41:55 -06:00
2015-05-02 09:54:30 +03:00
2015-05-05 14:24:45 -05:00
2015-04-01 17:21:35 +02:00
2015-06-08 17:04:11 -06:00
2015-07-02 17:11:28 -07:00
2015-02-26 11:57:30 -08:00
2015-03-20 07:41:55 -06:00
2015-06-22 10:14:05 -06:00
2015-03-20 07:41:55 -06:00
2015-06-24 17:49:40 -07:00
2015-05-13 15:39:04 -04:00
2015-02-24 06:45:25 +09:00
2015-02-23 07:16:46 -06:00
2015-06-23 06:49:44 -06:00
2015-06-22 14:54:22 -07:00
2015-03-20 07:41:55 -06:00
2015-04-30 09:35:41 -07:00
2015-07-04 14:09:25 -04:00
2015-05-11 21:42:23 +05:30
2015-05-06 14:45:19 +02:00
2015-05-19 15:47:18 +02:00
2015-04-18 11:10:49 -04:00
2015-06-16 21:12:52 +03:00
2015-03-24 22:01:58 -06:00
2015-05-22 09:38:56 -06:00
2015-05-14 15:34:52 -04:00
2015-06-11 15:16:55 +10:00
2015-06-12 17:26:56 -07:00
2015-05-05 09:50:38 -04:00
ca6e440577
