Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
authorNian Wu <nian.wu@intel.com>
Wed, 13 Dec 2006 21:49:00 +0000 (13:49 -0800)
committerZou Nan hai <nanhai.zou@intel.com>
Wed, 13 Dec 2006 21:49:00 +0000 (13:49 -0800)
commit77b862a84910713760665ca5af5e27fba48466dc
tree4bbccbf08f451ebfaab5eecbf97bd587927e0887
parented7fbad2066f846bf9466b13b184a50d6f87f972
parent2956a0c8a8395e4d9ae00888aeb88ea5c38b89ad
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
src/mesa/drivers/dri/i965/intel_ioctl.c