Merge branch 'object-purgeable'
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 5 Mar 2010 15:03:51 +0000 (15:03 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 5 Mar 2010 15:03:56 +0000 (15:03 +0000)
commit6ba31fb2dbe6a90e6d60a49b3e5bd2edce05241d
tree6b7a36a3b422cf33f94ea6eff5e37b01c0361b81
parent3490923c817cd81d46a405de117e9ba8a8aeef3c
parent755915fa5d9ea782d142b3f8755b62d6de28fe29
Merge branch 'object-purgeable'

Acked-by: Brian Paul <brianp@vmware.com>
src/mesa/drivers/dri/intel/intel_buffer_objects.c