mesa: Changes to 'master'

[Haihao Xiang]

 src/mesa/drivers/dri/i915/intel_ioctl.c |    2 +-
 src/mesa/drivers/dri/i965/intel_ioctl.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary

New commits:
commit f8830a1bf788909a18b6089eb159a38c19bf48d6
Author: Xiang, Haihao <haihao.xiang at intel.com>
Date:   Fri Dec 21 17:03:55 2007 +0800

    intel: cast a pointer to unsigned long, avoid potential error.