Daniel Vetter 767878908e
Merge tag 'v3.4-rc3' into drm-intel-next-queued ...
Backmerge Linux 3.4-rc3 into drm-intel-next to resolve a few things
that conflict/depend upon patches in -rc3:
- Second part of the Sandybridge workaround series - it changes some
of the same registers.
- Preparation for Chris Wilson's fencing cleanup - we need the fix
from -rc3 merged before we can move around all that code.
- Resolve the gmbus conflict - gmbus has been disabled in 3.4 again,
but should be enabled on all generations in 3.5.
Conflicts:
drivers/gpu/drm/i915/intel_i2c.c
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch >
2012-04-17 11:16:20 +02:00
2012-03-26 09:53:22 +01:00
2012-04-02 11:07:42 +01:00
2012-04-02 11:07:42 +01:00
2012-03-26 09:53:12 +01:00
2012-03-26 09:53:12 +01:00
2012-04-10 10:27:46 +01:00
2012-02-03 09:38:05 +00:00
2012-03-21 06:55:50 +00:00
2012-02-29 17:15:08 -05:00
2011-05-26 09:19:31 +10:00
2012-03-21 06:55:57 +00:00
2012-02-29 17:15:08 -05:00
2012-03-26 09:53:22 +01:00
2012-02-27 14:46:13 +00:00
2012-03-21 06:55:57 +00:00
2012-03-26 09:53:22 +01:00
2011-05-26 09:22:05 +10:00
2012-03-21 06:55:54 +00:00
2012-03-21 06:55:57 +00:00
2012-03-21 06:55:57 +00:00
2012-03-21 06:55:49 +00:00
2011-10-18 09:44:52 +01:00
2012-04-17 11:16:20 +02:00
2012-02-03 09:41:35 +00:00
2011-10-18 09:53:05 +01:00
2012-03-15 10:24:32 +00:00
2012-03-15 10:24:32 +00:00
2012-02-27 14:46:13 +00:00
2012-03-15 10:24:32 +00:00
2011-12-19 18:40:26 +00:00
2012-02-03 09:31:14 +00:00
2012-03-24 10:08:39 -07:00
2011-10-18 09:44:38 +01:00
2012-04-10 10:21:00 +01:00
2012-03-26 09:53:22 +01:00
2012-01-03 09:40:47 +00:00
2012-04-17 11:16:20 +02:00
2012-03-26 09:53:22 +01:00
2011-12-01 09:57:34 +00:00
2012-03-21 06:55:58 +00:00
2012-03-21 06:55:55 +00:00
2012-03-21 06:55:52 +00:00
2012-02-02 15:25:16 +00:00
2012-02-29 10:14:14 +00:00
2012-01-24 17:34:32 +00:00
2012-02-03 09:31:14 +00:00
2012-04-10 10:21:00 +01:00
2012-04-10 10:21:00 +01:00
2012-03-21 06:55:58 +00:00
2012-02-16 18:31:07 +00:00
2012-04-12 09:42:54 +01:00
2012-03-20 08:47:50 +00:00
2012-04-12 09:27:47 +01:00
2012-03-21 06:55:51 +00:00
2012-03-21 06:55:49 +00:00
2012-03-21 06:55:58 +00:00
2012-03-21 06:55:55 +00:00
2012-03-20 08:47:46 +00:00
2012-02-14 10:56:16 +00:00
2012-02-29 17:47:57 +00:00
2012-03-20 08:47:50 +00:00
2012-04-11 09:36:53 +01:00
2012-01-23 11:00:48 +00:00
2011-10-18 09:53:05 +01:00
2012-04-12 09:27:47 +01:00
2012-03-20 08:47:46 +00:00
2012-04-10 10:21:00 +01:00
2011-10-18 09:53:05 +01:00
2011-07-25 20:57:13 -07:00
2012-03-21 06:55:51 +00:00
2012-04-02 11:09:50 +01:00
2012-03-20 08:47:41 +00:00
2012-03-21 06:55:55 +00:00
2012-03-21 06:55:50 +00:00
2012-03-21 06:55:53 +00:00
2011-12-20 19:52:12 +00:00
2012-01-05 10:03:53 +00:00
2011-10-18 09:53:05 +01:00
2012-01-05 10:02:42 +00:00
2012-02-29 10:14:14 +00:00
2012-03-21 06:55:55 +00:00
2012-03-15 10:24:32 +00:00
2012-03-15 10:24:32 +00:00
2012-03-15 10:24:32 +00:00
2012-03-22 13:08:22 -07:00
2012-03-15 10:24:32 +00:00
2012-03-24 10:08:39 -07:00
2012-03-21 06:55:54 +00:00
2012-03-21 06:55:50 +00:00
2012-04-12 09:27:47 +01:00
2012-03-21 06:55:54 +00:00
767878908e