mesa: Changes to 'master'

[Jesse Barnes]

 src/mesa/drivers/dri/i915/intel_context.c         |   20 ++++----
 src/mesa/drivers/dri/i915/server/i830_common.h    |   19 ++++---
 src/mesa/drivers/dri/i915tex/intel_buffers.c      |   54 +++++++++++-----------
 src/mesa/drivers/dri/i915tex/intel_fbo.h          |    2 
 src/mesa/drivers/dri/i915tex/server/i830_common.h |   19 ++++---
 5 files changed, 60 insertions(+), 54 deletions(-)

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

New commits:
commit 7f6decf3e4c0fe17e149a97cbf2b56b86559d409
Merge: 78b7e49... 0aedb9a...
Author: Jesse Barnes <jesse.barnes at intel.com>
Date:   Tue Sep 11 03:55:40 2007 -0700

    Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa

commit 78b7e49c846c535f6907c18a9982d07c9e9feabb
Author: Jesse Barnes <jesse.barnes at intel.com>
Date:   Tue Sep 11 03:54:34 2007 -0700

    intel: disentangle planes & pipes
    
    This is the Mesa portion of the pipe & plane disambiguation.  Mesa needs to use
    the new assumptions about plane vs. pipe mappings and should use the new SAREA
    field names to avoid confusion.