Merge branch 'master' into i915-superioctl
authorDave Airlie <airlied@redhat.com>
Fri, 12 Oct 2007 01:02:46 +0000 (11:02 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 12 Oct 2007 01:02:46 +0000 (11:02 +1000)
commitbf805d3bf5bf191aa669b6155316a78917cf9b0e
treed76223fb22381485f7ecc8f6c7d026dcd88d80f3
parent9e06cf00cfb24528653913fc90eded4d370c1149
parent72c888869f4e5074e57c349ec356798959be791e
Merge branch 'master' into i915-superioctl
src/mesa/drivers/dri/i915/intel_batchbuffer.c