Merge branch 'origin' into crestline
authorEric Anholt <eric@anholt.net>
Mon, 11 Dec 2006 18:50:25 +0000 (10:50 -0800)
committerEric Anholt <eric@anholt.net>
Mon, 11 Dec 2006 18:50:25 +0000 (10:50 -0800)
commitd214138910218a24e8ae427d5ec6ff886dcb98a8
treec9e47cd2b3a0f30308c669c1fe1cef2e2ae6c2f5
parent89433fef0dc9b7494904f99dd343042ddbbc3d80
parent26626c0052cd5442f609659aa9ed25ac78e65b55
Merge branch 'origin' into crestline
src/mesa/drivers/dri/i965/intel_ioctl.c