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-18 11:53:51 -07:00
2014-10-29 16:33:15 -07:00
2014-11-13 16:17:06 -08:00
2014-10-27 13:00:55 +01:00
2014-11-13 16:17:06 -08:00
2014-10-09 22:25:59 -04:00
2014-10-09 22:26:00 -04:00
2014-10-09 22:26:00 -04:00
2014-11-13 13:46:09 +11:00
2014-10-09 22:26:00 -04:00
2014-11-13 13:46:09 +11:00
2014-11-13 13:46:09 +11:00
2014-11-13 16:17:05 -08:00
2014-10-09 22:25:57 -04:00
2014-11-13 13:28:55 -05:00
2014-10-09 22:26:01 -04:00
2014-10-09 22:25:50 -04:00
2014-11-13 13:46:09 +11:00
2014-10-12 09:21:57 -04:00
2014-10-29 16:33:15 -07:00
2014-11-13 16:17:06 -08:00
2014-11-13 13:46:09 +11:00
2014-10-09 22:26:02 -04:00
2014-11-13 13:46:09 +11:00
2014-10-13 15:44:12 +02:00
2014-10-29 16:33:14 -07:00
2014-11-13 13:46:09 +11:00
2014-10-14 02:18:28 +02:00
2014-10-09 22:26:00 -04:00
2014-11-13 16:17:06 -08:00
2014-10-21 23:44:21 +02:00
2014-11-13 16:17:06 -08:00
2014-10-29 16:33:13 -07:00
2014-11-13 16:17:05 -08:00
2014-10-29 16:33:15 -07:00
2014-10-09 22:25:58 -04:00
2014-10-08 12:01:52 -04:00
2014-11-13 13:46:09 +11:00
2014-10-24 00:14:37 +02:00
2014-11-13 16:17:05 -08:00
2014-10-14 02:18:12 +02:00
2014-10-09 22:25:51 -04:00
2014-10-09 22:25:50 -04:00
2014-10-09 22:25:51 -04:00
2014-10-09 22:25:59 -04:00
2014-10-09 22:25:59 -04:00
2014-11-07 08:29:25 +11:00
2014-10-09 22:25:50 -04:00
2014-10-09 22:25:56 -04:00
2014-10-09 22:25:59 -04:00
2014-10-09 22:26:02 -04:00
2014-10-09 22:26:03 -04:00
2014-10-09 22:26:03 -04:00