Daniel Vetter 54499b2a92
Merge tag 'drm-intel-fixes-2014-11-19' into drm-intel-next-queued ...
So with all the code movement and extraction in intel_pm.c in -next
git is hopelessly confused with
commit 2208d655a9daniel.vetter@ffwll.ch >
Date: Fri Nov 14 09:25:29 2014 +0100
drm/i915: drop WaSetupGtModeTdRowDispatch:snb
from -fixes. Worse even small changes in -next move around the
conflict context so rerere is equally useless. Let's just backmerge
and be done with it.
Conflicts:
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c
Except for git getting lost no tricky conflicts really.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com >
2014-11-19 18:17:38 +01:00
2014-10-21 10:31:26 -04:00
2014-09-26 11:02:55 +02:00
2014-09-26 08:24:05 +01:00
2014-10-08 17:22:23 -04:00
2014-10-20 17:55:38 +01:00
2014-09-26 11:02:55 +02:00
2014-09-26 11:02:56 +02:00
2014-10-18 11:53:51 -07:00
2014-10-09 22:26:02 -04:00
2014-09-24 22:16:06 -04:00
2014-05-27 13:56:21 -07:00
2014-07-07 01:22:19 +02:00
2014-10-28 09:06:11 -04:00
2014-08-01 12:30:37 -04:00
2014-11-14 14:09:19 -08:00
2014-11-19 18:17:38 +01:00
2014-10-09 15:03:49 -04:00
2014-09-21 17:03:04 -03:00
2014-05-26 12:53:40 +10:00
2014-01-07 11:54:28 +09:00
2014-05-05 15:32:05 +02:00
2014-10-24 00:14:39 +02:00
2014-07-17 18:43:40 -07:00
2014-02-28 15:12:08 -08:00
2014-10-09 14:58:15 -04:00
2014-08-25 03:28:09 -05:00
2014-09-24 09:25:06 -07:00
2014-10-16 09:16:22 +02:00
2014-09-26 11:02:55 +02:00
2014-02-10 16:01:40 -08:00
2014-08-10 20:36:00 -07:00
2014-11-13 17:50:23 -08:00
2014-10-08 20:16:19 +11:00
2014-04-16 14:13:27 -07:00
2014-08-19 10:02:56 +02:00
2014-08-29 16:28:17 -07:00
2014-01-08 15:32:51 -08:00
2014-09-26 11:02:59 +02:00
2014-02-10 16:01:40 -08:00
2014-10-13 15:51:40 +02:00
2014-02-10 16:01:40 -08:00
2014-10-03 15:48:20 +02:00
2014-08-26 09:35:53 +02:00
2014-09-26 11:02:55 +02:00
2014-06-11 08:35:34 -07:00
2014-11-05 15:43:57 -05:00
2014-06-19 15:28:56 +02:00
2014-09-26 11:02:55 +02:00
2014-03-08 12:39:44 +05:30
2014-06-10 19:11:06 -04:00
2014-10-23 23:02:36 +02:00
2014-10-08 20:16:19 +11:00
2014-10-28 08:46:27 -04:00
2014-10-24 16:07:10 -04:00
2014-08-08 15:57:24 -07:00
2014-09-07 16:27:28 -07:00
2014-06-04 08:50:34 -07:00
2014-09-16 10:23:45 +02:00
2014-10-21 12:53:45 -07:00
2014-10-12 10:13:55 -04:00
2014-10-08 06:52:11 -04:00
2014-08-04 15:20:48 +02:00
2014-10-07 21:14:57 -04:00
2014-10-14 02:18:21 +02:00
2014-10-02 21:35:54 -07:00
2014-06-17 14:50:17 +10:00
2014-09-26 11:02:59 +02:00
2014-08-06 18:01:20 -07:00
2014-09-23 22:33:19 -07:00
2014-10-25 10:53:44 -04:00
2014-11-03 14:43:26 -02:00
2014-09-27 11:03:33 +02:00
2014-10-22 14:26:04 -04:00
2014-06-19 17:45:14 -07:00
2014-09-26 11:02:55 +02:00
2014-09-19 12:48:02 +02:00
2014-01-15 00:25:14 +04:00
2014-08-06 21:03:53 -07:00
2014-08-13 10:32:03 +02:00
2014-09-26 11:10:11 +02:00
2013-12-02 11:24:18 +00:00
2014-04-18 14:20:48 +02:00
2014-10-14 02:18:16 +02:00
2014-09-09 10:35:58 +02:00
2013-12-03 10:08:57 -08:00
2014-05-12 17:08:33 -07:00
2014-08-26 09:35:54 +02:00
2014-03-20 13:43:40 +01:00
2014-05-29 15:50:30 +02:00
2014-04-04 09:50:07 -07:00
2014-09-26 11:22:29 +02:00
2014-05-26 17:28:27 -06:00
2014-05-05 15:32:05 +02:00
2014-08-28 11:57:24 +05:30
2014-05-20 16:54:21 -06:00
2014-08-28 12:37:55 +05:30
2014-04-09 13:44:34 -07:00
2014-05-05 15:32:05 +02:00
2014-06-04 08:50:34 -07:00
2014-04-30 19:57:05 +01:00
2014-06-29 13:38:33 -07:00
2014-03-21 13:16:58 +01:00
2014-10-28 09:06:11 -04:00
2014-05-04 09:49:46 +02:00
2013-12-02 14:48:28 +01:00
2014-05-27 10:16:44 +02:00
2014-04-07 16:36:11 -07:00
2014-05-25 12:39:00 -07:00
2014-11-07 08:54:53 -08:00
2014-02-17 14:56:08 -08:00
2014-03-21 13:16:58 +01:00
2014-10-24 13:59:03 -04:00
2013-12-07 21:20:11 -08:00
2014-09-09 08:53:27 +02:00
2014-08-26 09:35:52 +02:00
2014-09-28 11:08:00 +02:00
2014-04-16 14:20:34 -07:00
2014-10-08 10:39:41 +05:30
2014-09-26 11:02:56 +02:00
2013-12-02 14:45:19 +01:00
2014-09-07 16:15:53 -07:00
2014-10-09 22:25:52 -04:00
2014-04-06 09:38:07 -07:00
2014-08-08 15:57:24 -07:00
2014-07-22 12:46:11 +05:30
2014-09-04 10:05:07 +02:00
2014-10-14 02:18:26 +02:00
2014-05-21 11:19:36 +02:00
2014-05-05 15:32:05 +02:00
2014-05-05 15:32:05 +02:00
2013-11-30 14:08:28 +01:00
2014-05-05 15:32:05 +02:00
2014-07-09 15:54:27 -07:00
2013-12-02 14:45:19 +01:00
2014-06-19 15:15:27 +02:00
2014-10-29 08:56:46 -04:00
2014-09-19 14:44:51 -07:00
2014-09-26 11:03:00 +02:00
2013-12-06 16:37:43 -05:00
2014-08-05 15:28:48 +10:00
2013-12-03 11:15:58 -08:00
2014-09-23 23:44:16 -07:00
54499b2a92
