Merge branch 'drm-gem'
authorEric Anholt <eric@anholt.net>
Fri, 8 Aug 2008 22:32:24 +0000 (15:32 -0700)
committerEric Anholt <eric@anholt.net>
Fri, 8 Aug 2008 22:32:24 +0000 (15:32 -0700)
commit53675e5c05c0598b7ea206d5c27dbcae786a2c03
treed4bc5c9aa659b6b0e82245b0405ca740cc3d2a66
parent501338d70e96e0388fd5198625d856c4ec07745f
parentd2796939f18815935c8fe1effb01fa9765d6c7d8
Merge branch 'drm-gem'

Conflicts:

src/mesa/drivers/dri/intel/intel_span.c
src/mesa/main/fbobject.c

This converts the i915 driver to use the GEM interfaces for object management.
src/mesa/drivers/dri/intel/intel_screen.c
src/mesa/drivers/dri/intel/intel_span.c