mesa: Changes to 'master'

[Jesse Barnes]

The branch, master has been updated
        Commits at: http://cgit.freedesktop.org/mesa/mesa/log/?h=master

Summary of changes:
 src/mesa/drivers/dri/intel/intel_buffers.c |   54 ++++++++--------------------
 1 files changed, 15 insertions(+), 39 deletions(-)

       via  97988ccc46c0248177cd71937021ca8cc2a7452b (commit)
      from  b993d539a76e7f1446890a85e4b61deec4d4162d (commit)


- Commits -----------------------------------------------
commit 97988ccc46c0248177cd71937021ca8cc2a7452b
Author: Jesse Barnes <jbarnes at jbarnes-t61.(none)>
Date:   Tue Jul 22 09:39:23 2008 -0700

    intel: fix buffer swaps and enable page flipping on 965
    
    Some buffer swap intel render buffer fields (pf_num_pages & vbl_pending) are
    also used for page flipping, so enable the code that sets & updates them on
    965.  This allows buffer swaps and page flips to work on 965 and prevents hangs
    in LOCK_HARDWARE in the buffer swap case due to an uninitialized vbl_pending
    field.
    
    Fixes FDO #16118.

---------------------------------