Daniel Vetter a8cbd45977
Merge branch 'drm-intel-next-fixes' into drm-intel-next ...
So I've sent the first pull request to Dave and I expect his request
for a merge tree any second now ;-)
More seriously I have some pending patches for 3.19 that depend upon
both trees, hence backmerge. Conflicts are all trivial.
Conflicts:
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c
v2: Of course I've forgotten the fixup script for the silent conflict.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com >
2014-10-21 14:42:30 +02:00
2014-09-11 15:09:30 +02:00
2014-09-06 11:27:15 +09:00
2014-08-13 18:27:40 -06:00
2014-08-31 13:23:45 +01:00
2014-08-25 15:39:23 -04:00
2014-09-13 09:39:55 -07:00
2014-07-31 01:07:28 +02:00
2014-09-05 13:25:01 -07:00
2014-09-19 14:43:11 +02:00
2014-08-08 11:14:29 -07:00
2014-08-08 11:14:29 -07:00
2014-07-23 10:18:07 -07:00
2014-09-08 00:02:58 +02:00
2014-08-27 15:40:45 +01:00
2014-08-14 18:10:33 -06:00
2014-07-23 00:51:30 +02:00
2014-09-11 10:54:25 +05:30
2014-08-28 11:59:09 +05:30
2014-08-15 17:56:45 -06:00
2014-07-23 10:22:35 +09:00
2014-08-06 09:38:14 -07:00
2014-08-22 08:45:40 +01:00
2014-08-29 14:31:43 +02:00
2014-10-21 14:42:30 +02:00
2014-08-27 09:38:06 -07:00
2014-08-06 20:06:14 -07:00
2014-08-04 17:32:24 -07:00
2014-08-28 11:18:47 -07:00
2014-07-29 11:46:28 +03:00
2014-09-04 19:59:42 +02:00
2014-08-05 21:16:46 -07:00
2014-08-15 17:06:40 -04:00
2014-08-04 18:36:12 -07:00
2014-08-29 20:13:00 -07:00
2014-09-11 10:08:36 -07:00
2014-09-05 16:01:46 +02:00
2014-09-03 12:08:10 +00:00
2014-08-22 11:31:30 -07:00
2014-09-02 10:02:13 -07:00
2014-08-06 18:01:19 -07:00
2014-08-07 17:23:16 -07:00
2014-07-29 01:57:25 -07:00
2014-09-10 11:20:47 -04:00
2014-08-08 15:57:28 -07:00
2014-07-29 19:26:30 -05:00
2014-07-25 17:16:58 -04:00
2014-08-28 15:57:55 +01:00
2014-09-08 14:38:14 -07:00
2014-08-14 18:10:33 -06:00
2014-09-06 12:12:09 -07:00
2014-09-07 16:11:10 -07:00
2014-07-23 01:14:41 +02:00
2014-09-14 00:10:38 -04:00
2014-08-16 09:03:58 +01:00
2014-08-27 14:35:04 +02:00
2014-08-08 15:57:25 -07:00
2014-09-03 08:45:48 -07:00
2014-08-07 08:50:34 -07:00
2014-08-28 11:17:43 +05:30
2014-09-10 14:25:51 +02:00
2014-09-03 10:45:12 -07:00
2014-07-30 00:23:09 +02:00
2014-08-08 11:14:29 -07:00
2014-09-03 01:29:00 +02:00
2014-08-12 12:15:14 -06:00
2014-08-18 10:58:43 +02:00
2014-08-12 12:15:14 -06:00
2014-08-07 17:17:39 -07:00
2014-08-29 16:28:16 -07:00
2014-09-08 08:27:00 -07:00
2014-08-05 18:57:18 -07:00
2014-08-29 11:21:49 -07:00
2014-08-22 12:28:16 +09:00
2014-08-31 13:46:19 +01:00
2014-08-25 15:39:22 -04:00
2014-09-16 11:38:04 +10:00
2014-08-06 20:10:32 -07:00
2014-07-22 10:13:00 +08:00
2014-08-26 14:54:48 -07:00
2014-09-08 16:33:56 -07:00
2014-09-11 15:08:14 -07:00
2014-09-08 16:03:21 -07:00
2014-08-08 10:39:16 -06:00
2014-09-16 11:38:04 +10:00
2014-07-27 21:07:15 +09:30
2014-08-08 15:57:30 -07:00
2014-08-07 08:47:00 -07:00
2014-09-11 16:52:29 -07:00
2014-08-04 17:32:24 -07:00
2014-08-04 18:34:04 -07:00
a8cbd45977