mesa: Changes to 'master'

[Haihao Xiang]

 src/mesa/drivers/dri/i915/intel_tris.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

New commits:
commit e54329233522591bbe8aad8a3fd6bcdc1e430f03
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Thu Dec 20 16:49:25 2007 +0800

    i915: avoid dead lock in intel_meta_draw_poly. fix #13696