1. 24 Aug, 2012 4 commits
  2. 23 Aug, 2012 26 commits
  3. 17 Aug, 2012 1 commit
    • Daniel Vetter's avatar
      Merge tag 'v3.6-rc2' into drm-intel-next · a22ddff8
      Daniel Vetter authored
      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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      a22ddff8
  4. 16 Aug, 2012 9 commits