mesa: Changes to 'master'

[Haihao Xiang]

 src/mesa/drivers/dri/i965/brw_sf.c      |    2 +-
 src/mesa/drivers/dri/i965/brw_sf_emit.c |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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

New commits:
commit ae078e1a0abae58e325ed3ebcb1884867847826b
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Wed Sep 12 15:13:06 2007 +0800

    i965: revert commit 1a15b2169ba6cb100627eb525a20a00537cfb6f0,
    and keep the instruction state unchanged after calling
    brw_emit_tri_setup/brw_emit_line_setup when building setup
    thread for SF_UNFILLED_TRIS.