mesa: Changes to 'master'

[Oliver McFadden]

 src/mesa/drivers/dri/r300/r300_texmem.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary

New commits:
commit 65fae193831e9fd4b2fc5a1b8170215cc77427dd
Author: Oliver McFadden <z3ro.geek at gmail.com>
Date:   Sat May 12 17:16:56 2007 +0000

    Revert "r300: Perform the locking closer to the DRM texture upload call."
    
    This reverts commit 93881edb46fc95e1cfb4ded4e8a5db92612d3e4d.