mesa: Changes to 'master'

[Dave Airlie]

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

Summary of changes:

       via  f75843a517bd188639e6866db2a7b04de3524e16 (commit)
       via  7c81124d7c4a4d1da9f48cbf7e82ab1a3a970a7a (commit)
      from  a35002c1673a1a37ec79b237dda7e8f6b9c9962a (commit)


- Commits -----------------------------------------------
commit f75843a517bd188639e6866db2a7b04de3524e16
Author: Dave Airlie <airlied at linux.ie>
Date:   Sun Aug 24 17:59:10 2008 +1000

    Revert "Revert "Merge branch 'drm-gem'""
    
    This reverts commit 7c81124d7c4a4d1da9f48cbf7e82ab1a3a970a7a.

commit 7c81124d7c4a4d1da9f48cbf7e82ab1a3a970a7a
Author: Dave Airlie <airlied at linux.ie>
Date:   Sun Aug 24 17:52:40 2008 +1000

    Revert "Merge branch 'drm-gem'"
    
    This reverts commit 53675e5c05c0598b7ea206d5c27dbcae786a2c03.
    
    Conflicts:
    
    	src/mesa/drivers/dri/i965/brw_wm_surface_state.c

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