1
0
Files
linux/drivers
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-02 13:51:46 -04:00
2012-08-04 12:15:39 +04:00
2012-08-13 10:15:22 +05:30
2012-07-29 21:11:05 -03:00
2012-08-06 18:10:04 +02:00
2012-08-13 14:34:02 +08:00
2012-08-12 13:42:18 -07:00
2012-08-10 12:27:47 +02:00
2012-07-31 08:16:24 -06:00
2012-07-31 08:16:22 -06:00
2012-07-31 08:16:22 -06:00