mesa: Changes to 'master'

[Eric Anholt]

 src/mesa/drivers/dri/i965/brw_wm_surface_state.c |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

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

New commits:
commit b39f15b88f4ef585f260db689294c12b1aee41f2
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Feb 28 16:04:54 2008 -0800

    [965] Fix conditional sequencing to allow the frame_buffer_texobj case.
    
    Previously the frame_buffer_texobj case would have been bound as a normal
    texture, at best resulting in no surface data being associated with it.