mesa: Changes to 'master'

[Eric Anholt]

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

Summary of changes:
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c |   59 +++++++++++++++------
 1 files changed, 42 insertions(+), 17 deletions(-)

       via  9cc13eba3e58d5cbb905c51828b6b2743dc61290 (commit)
       via  ce61660ab90d2f80370e423e4cd40a51ff4c4902 (commit)
      from  b17b110716936c32d20910cb9589038062b4f527 (commit)


- Commits -----------------------------------------------
commit 9cc13eba3e58d5cbb905c51828b6b2743dc61290
Author: Dave Airlie <airlied at linux.ie>
Date:   Fri Jul 25 20:32:22 2008 +1000

    i965: fixup format for TFP zero copy
    (cherry picked from commit 9bc9e0ecb0fb2069b2c123e665eb2118e358098f which
    was lost in a merge)

commit ce61660ab90d2f80370e423e4cd40a51ff4c4902
Author: Dave Airlie <airlied at linux.ie>
Date:   Fri Jul 25 19:56:56 2008 +1000

    i965: make tex offset override work..
    
    should fix fd.o 14441
    
    (cherry-picked from commit d4244683a61f66cfb78408a37cf2587587847f96 which was
    lost in a merge)

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