mesa: Changes to 'master'

[Ben Skeggs]

 src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c |    6 +-
 src/mesa/drivers/dri/nouveau/nouveau_bufferobj.h |    2 
 src/mesa/drivers/dri/nouveau/nouveau_buffers.c   |   10 ++-
 src/mesa/drivers/dri/nouveau/nouveau_context.c   |    4 -
 src/mesa/drivers/dri/nouveau/nouveau_context.h   |   13 ++--
 src/mesa/drivers/dri/nouveau/nouveau_fifo.c      |   14 ++++
 src/mesa/drivers/dri/nouveau/nouveau_object.c    |   59 +-------------------
 src/mesa/drivers/dri/nouveau/nouveau_object.h    |   14 ----
 src/mesa/drivers/dri/nouveau/nouveau_query.c     |    9 +--
 src/mesa/drivers/dri/nouveau/nouveau_screen.c    |    2 
 src/mesa/drivers/dri/nouveau/nouveau_span.c      |    5 +
 src/mesa/drivers/dri/nouveau/nouveau_state.c     |    4 -
 src/mesa/drivers/dri/nouveau/nouveau_sync.c      |   67 +++++++++++------------
 src/mesa/drivers/dri/nouveau/nouveau_sync.h      |   32 +++++-----
 src/mesa/drivers/dri/nouveau/nv30_state.c        |   52 ++++++++++++-----
 15 files changed, 137 insertions(+), 156 deletions(-)

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

New commits:
commit 5e4a0f42f243cd5fbc8718660d78705e8c70808f
Author: Ben Skeggs <darktama at nisroch.keine.ath.cx>
Date:   Sun Jun 10 03:05:05 2007 +1000

    nouveau: match drm changes (0.0.7)

commit 17e81bda6ed1d2cc4e5c0fad895030911b4fa53c
Author: Ben Skeggs <skeggsb at gmail.com>
Date:   Fri Jun 8 13:27:57 2007 +1000

    nouveau: NV30_TCL viewport/scissor fixes