Merge commit 'origin/master' into drm-gem
authorKeith Packard <keithp@keithp.com>
Wed, 4 Jun 2008 05:56:25 +0000 (22:56 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 4 Jun 2008 05:56:25 +0000 (22:56 -0700)
commitdbf3c5247c90bd35c0b2002e3b972a2dd4c8b130
treedd986e993f20f78999fc15c304289656878ffcae
parent4b5b008d54e86ac4f0a2176429d062100978ca8c
parent0b734bd7cf921592eee441f759687e10f48a2cbc
Merge commit 'origin/master' into drm-gem

Conflicts:

src/mesa/drivers/dri/common/dri_bufmgr.h
src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c
src/mesa/drivers/dri/intel/intel_bufmgr_ttm.h
src/mesa/drivers/dri/intel/intel_ioctl.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
src/mesa/drivers/dri/intel/intel_ioctl.c