Dave Airlie e8115e79aa
Merge tag 'v3.18-rc7' into drm-next ...
This fixes a bunch of conflicts prior to merging i915 tree.
Linux 3.18-rc7
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/tegra/dc.c
2014-12-02 10:58:33 +10:00
2014-10-09 16:07:43 -04:00
2014-10-27 23:50:36 -04:00
2014-09-30 13:17:14 -04:00
2014-10-15 07:05:03 +02:00
2014-10-03 15:37:54 +02:00
2014-08-26 09:35:51 +02:00
2014-10-18 18:11:04 -07:00
2014-11-26 09:40:39 +10:00
2014-09-22 11:43:08 +09:00
2014-10-15 06:56:23 +02:00
2014-11-13 16:12:28 +01:00
2014-09-22 11:14:52 -07:00
2014-10-19 12:50:44 -07:00
2014-10-08 06:50:18 -04:00
2014-10-03 11:24:46 -07:00
2014-11-18 11:34:35 -06:00
2014-09-16 19:15:23 +01:00
2014-09-26 00:27:19 +02:00
2014-10-21 11:21:19 -07:00
2014-09-23 16:13:51 -03:00
2014-09-16 12:55:05 +02:00
2014-10-15 06:58:16 +02:00
2014-09-09 13:59:19 +02:00
2014-10-18 11:48:03 -07:00
2014-10-31 15:54:18 -04:00
2014-11-13 13:56:19 +01:00
2014-11-13 15:43:41 -07:00
2014-10-08 06:47:31 -04:00
2014-11-18 12:01:52 -06:00
2014-10-15 06:56:23 +02:00
2014-08-26 09:35:51 +02:00
2014-07-31 00:10:45 -05:00
2014-08-26 10:44:08 +02:00
2014-08-16 16:56:23 -05:00
2014-10-08 17:22:23 -04:00
2014-08-29 21:46:40 +08:00
2014-10-14 02:18:18 +02:00
2014-09-10 06:59:41 -07:00
2014-09-24 09:49:15 -04:00
2014-10-27 11:17:41 +00:00
2014-10-03 16:33:42 +01:00
2014-11-26 09:40:39 +10:00
2014-11-02 23:02:49 -04:00
2014-09-29 01:59:51 +02:00
2014-10-01 13:11:25 +02:00
2014-09-23 22:15:18 -07:00
2014-11-26 20:09:40 +02:00
2014-10-20 20:57:13 +02:00
2014-09-23 23:44:16 -07:00
2014-10-21 10:31:27 -04:00
2014-12-02 10:58:33 +10:00
e8115e79aa