Daniel Vetter 967ad7f148
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next ...
The conflict in intel_drv.h tripped me up a bit since a patch in dinq
moves all the functions around, but another one in drm-next removes a
single function. So I'ev figured backing this into a backmerge would
be good.
i915_dma.c is just adjacent lines changed, nothing nefarious there.
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_drv.h
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch >
2013-10-10 12:44:43 +02:00
2013-09-25 19:46:48 +02:00
2013-09-25 13:27:42 -07:00
2013-09-15 22:18:55 -04:00
2013-09-26 14:46:11 -07:00
2013-09-09 14:44:33 -04:00
2013-09-24 17:00:26 -07:00
2013-09-06 13:30:06 -07:00
2013-09-25 15:50:53 -07:00
2013-09-09 15:49:04 -07:00
2013-09-26 02:31:04 +02:00
2013-09-25 03:25:58 +02:00
2013-09-12 11:22:45 -07:00
2013-09-07 12:53:35 +10:00
2013-09-13 15:09:52 +02:00
2013-09-06 11:14:33 -07:00
2013-09-03 11:37:15 -07:00
2013-09-11 15:58:51 -07:00
2013-09-13 15:09:52 +02:00
2013-10-10 12:44:43 +02:00
2013-09-17 21:54:05 -04:00
2013-09-26 14:20:22 -07:00
2013-09-26 03:48:43 -07:00
2013-09-28 16:32:12 +02:00
2013-09-05 15:21:30 -04:00
2013-09-21 12:52:50 +01:00
2013-09-13 15:09:52 +02:00
2013-09-15 07:13:39 -04:00
2013-09-12 11:29:26 -07:00
2013-09-09 16:35:29 -07:00
2013-09-15 22:27:04 -04:00
2013-09-12 11:35:33 -07:00
2013-09-06 08:09:27 +09:30
2013-09-18 12:02:00 -07:00
2013-09-25 15:12:46 -07:00
2013-09-13 15:09:52 +02:00
2013-09-06 13:30:06 -07:00
2013-09-11 15:59:35 -07:00
2013-09-13 15:09:52 +02:00
2013-09-26 13:56:53 -07:00
2013-09-13 15:09:52 +02:00
2013-09-17 09:08:14 -07:00
2013-09-19 13:57:28 -05:00
2013-09-05 11:08:01 -07:00
2013-09-11 19:11:59 -07:00
2013-09-03 22:52:48 -04:00
2013-09-03 16:24:35 -07:00
2013-09-28 13:25:30 -07:00
2013-09-04 17:31:11 -07:00
2013-09-15 17:42:59 -04:00
2013-09-11 15:58:15 -07:00
2013-09-13 15:09:52 +02:00
2013-09-13 15:09:52 +02:00
2013-09-06 13:21:16 -07:00
2013-09-04 17:31:11 -07:00
2013-09-11 15:58:59 -07:00
2013-09-11 15:59:15 -07:00
2013-09-19 13:57:28 -05:00
2013-09-13 15:09:52 +02:00
2013-10-09 15:55:32 +10:00
2013-09-12 16:11:45 -07:00
2013-09-03 09:10:34 -04:00
2013-09-29 13:47:00 -07:00
2013-09-03 11:37:15 -07:00
2013-09-26 16:22:29 -07:00
2013-09-04 11:28:04 -06:00
2013-09-17 22:56:09 +03:00
2013-09-26 15:33:23 +03:00
2013-09-09 10:02:53 +09:30
2013-09-13 15:09:52 +02:00
2013-09-12 08:45:53 -07:00
2013-09-25 15:50:53 -07:00
967ad7f148