mesa: Changes to 'master'

[Haihao Xiang]

 src/mesa/drivers/dri/i915/i915_texstate.c |    2 +-
 src/mesa/drivers/dri/i915/intel_context.h |    1 +
 src/mesa/drivers/dri/i915/intel_state.c   |   26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

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

New commits:
commit b422e5ad3716d32f2434ca38819f4a877c7eeeeb
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Tue Dec 25 17:22:19 2007 +0800

    i915: apply commit a0a5e8cfc04c14873441b50f7d594ef11806b9a8 from 965.
    fix #11925