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_fp.c |    4 ++--
 src/mesa/main/imports.c               |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

       via  3105bc1d885ea8ce083d2be85cbeac46d4d873a1 (commit)
       via  e9809a36aaea3480cba5bd62360bf9d481ff9011 (commit)
      from  f2b914298f677555d1e605cbcc2b7f73c0f0847a (commit)


- Commits -----------------------------------------------
commit 3105bc1d885ea8ce083d2be85cbeac46d4d873a1
Author: Andrzej Trznadel <Andrzej.Trznadel at intel.com>
Date:   Mon Mar 17 15:54:24 2008 -0700

    [965] Fix fp temp reg release code to not usually release all temps.
    
    Also, use wrapped ffs() instead of native.

commit e9809a36aaea3480cba5bd62360bf9d481ff9011
Author: Andrzej Trznadel <Andrzej.Trznadel at intel.com>
Date:   Mon Mar 17 15:52:08 2008 -0700

    Fix compat implementation of ffs() to return 1-based bit numbers.

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