Daniel Vetter a22ddff8be
Merge tag 'v3.6-rc2' into drm-intel-next ...
Backmerge Linux 3.6-rc2 to resolve a few funny conflicts before we put
even more madness on top:
- drivers/gpu/drm/i915/i915_irq.c: Just a spurious WARN removed in
-fixes, that has been changed in a variable-rename in -next, too.
- drivers/gpu/drm/i915/intel_ringbuffer.c: -next remove scratch_addr
(since all their users have been extracted in another fucntion),
-fixes added another user for a hw workaroudn.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch >
2012-08-17 09:01:08 +02:00
2012-08-12 21:34:09 +03:00
2012-07-27 15:14:26 -07:00
2012-08-02 11:50:24 -07:00
2012-08-06 13:29:57 -07:00
2012-08-08 20:49:33 +02:00
2012-08-02 13:51:46 -04:00
2012-08-04 12:15:39 +04:00
2012-08-14 07:52:41 +03:00
2012-07-30 17:25:13 -07:00
2012-08-08 20:49:25 +02:00
2012-07-26 14:28:55 -07:00
2012-07-31 19:07:42 -07:00
2012-08-13 10:15:22 +05:30
2012-07-29 21:11:05 -03:00
2012-07-30 12:41:17 -07:00
2012-07-30 09:32:39 -07:00
2012-07-31 19:07:42 -07:00
2012-08-14 07:50:36 +03:00
2012-08-17 09:01:08 +02:00
2012-07-31 18:47:44 -07:00
2012-07-31 19:07:42 -07:00
2012-07-30 10:10:26 -07:00
2012-07-31 19:07:42 -07:00
2012-07-26 14:28:55 -07:00
2012-07-30 07:47:27 -07:00
2012-08-09 15:16:41 +02:00
2012-08-06 18:10:04 +02:00
2012-08-06 13:22:50 -07:00
2012-08-13 14:34:02 +08:00
2012-08-02 11:34:40 -07:00
2012-07-31 18:47:44 -07:00
2012-07-30 17:25:17 -07:00
2012-08-10 12:28:57 +02:00
2012-07-30 17:25:34 -07:00
2012-08-01 16:41:07 -07:00
2012-08-12 21:31:44 +03:00
2012-08-12 13:42:18 -07:00
2012-07-27 15:14:26 -07:00
2012-08-07 14:34:12 +02:00
2012-08-10 14:29:43 +02:00
2012-08-02 11:52:39 -07:00
2012-07-30 17:25:21 -07:00
2012-07-26 07:45:20 +02:00
2012-07-31 00:51:09 +02:00
2012-07-26 16:19:08 -07:00
2012-07-26 16:19:08 -07:00
2012-08-08 20:49:16 +02:00
2012-08-08 07:32:55 -07:00
2012-08-01 09:02:41 -07:00
2012-08-09 13:21:05 +09:00
2012-08-10 12:27:47 +02:00
2012-08-02 11:52:39 -07:00
2012-08-01 10:26:23 -07:00
2012-07-31 18:08:25 -07:00
2012-08-01 13:48:54 +09:00
2012-08-12 21:31:44 +03:00
2012-07-31 08:16:24 -06:00
2012-07-29 13:49:10 -07:00
2012-08-01 10:45:12 -07:00
2012-07-26 11:25:33 -07:00
2012-08-02 11:50:24 -07:00
2012-07-31 08:16:22 -06:00
2012-07-31 08:16:22 -06:00
a22ddff8be