Dave Airlie e6b0b6a82f
Merge tag 'v3.5-rc7' into drm-next ...
Merge Linus tree into drm to fixup conflicts in radeon code for further
testing before upstream merge.
Signed-off-by: Dave Airlie <airlied@redhat.com >
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/radeon/radeon_gart.c
2012-07-20 00:53:28 -04:00
2012-05-29 16:22:22 -07:00
2012-04-23 16:45:54 -07:00
2012-05-18 17:41:16 -07:00
2012-05-16 05:32:20 -07:00
2012-06-11 16:49:35 -07:00
2012-03-28 18:30:03 +01:00
2012-05-01 21:48:44 -07:00
2012-04-23 16:46:11 -07:00
2012-03-28 18:30:03 +01:00
2012-06-14 17:28:46 -07:00
2012-06-12 11:12:19 -07:00
2012-05-18 17:38:17 -07:00
2012-03-20 11:26:30 -07:00
2012-05-18 17:13:52 -07:00
2012-06-25 14:53:09 -07:00
2012-04-13 10:57:04 -07:00
2012-04-10 09:29:21 -07:00
2012-05-22 16:34:21 -07:00
2012-04-24 11:33:22 -07:00
2012-07-19 21:52:38 -04:00
2012-05-02 11:48:07 -07:00
2012-04-10 09:29:21 -07:00
2012-06-04 12:28:45 -07:00
2012-05-09 13:52:23 -07:00
2012-05-09 13:52:23 -07:00
2012-05-09 13:52:23 -07:00
2012-06-15 14:50:04 -07:00
2012-05-14 13:31:09 -07:00
2012-05-02 11:48:07 -07:00
2012-03-28 18:30:03 +01:00
2012-05-02 11:48:07 -07:00
2012-05-10 14:13:17 -07:00
2012-04-29 21:32:20 -04:00
2012-03-28 12:34:33 -07:00
2012-04-10 10:27:58 -07:00
2012-05-02 11:48:07 -07:00
2012-06-12 11:10:50 -07:00
2012-05-02 11:48:07 -07:00
2012-05-02 11:48:07 -07:00
2012-05-09 13:52:23 -07:00
2012-05-14 15:43:44 -07:00
2012-04-24 11:28:25 -07:00
2012-05-02 11:48:07 -07:00
2012-06-04 12:28:45 -07:00
2012-03-21 09:40:26 -07:00
2012-05-09 13:20:22 -07:00
2012-05-22 16:34:21 -07:00
2012-05-22 16:34:21 -07:00
e6b0b6a82f