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/i915/intel_ioctl.h            |   44 --------------------
 src/mesa/drivers/dri/i965/brw_fallback.c           |    1 -
 src/mesa/drivers/dri/i965/brw_program.c            |    1 +
 src/mesa/drivers/dri/intel/intel_batchbuffer.c     |    1 -
 src/mesa/drivers/dri/{i965 => intel}/intel_ioctl.h |    0 
 src/mesa/drivers/dri/intel/intel_tex_subimage.c    |    1 +
 6 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 src/mesa/drivers/dri/i915/intel_ioctl.h
 rename src/mesa/drivers/dri/{i965 => intel}/intel_ioctl.h (100%)

       via  3323ccb803282dddcf1e403df33d00eaa0fbd0f8 (commit)
       via  6acb94f89e3314132190d235634a5e3423826757 (commit)
      from  6e19f82c37191dabcdd882d0edac98a2ca9c11e4 (commit)


- Commits -----------------------------------------------
commit 3323ccb803282dddcf1e403df33d00eaa0fbd0f8
Author: Eric Anholt <eric at anholt.net>
Date:   Fri May 2 12:25:48 2008 -0700

    [intel] Warnings fixes.

commit 6acb94f89e3314132190d235634a5e3423826757
Author: Eric Anholt <eric at anholt.net>
Date:   Fri May 2 12:25:12 2008 -0700

    [intel] Merge intel_ioctl.h.  Not sure how this slipped by in the .c merge.

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