tree 7e04eb2b4e87137455920f6131b064dc87056e14
parent 250b92f3bb4fc4a53f3150b0e8ff1e121a5adbc7
parent 9ca563a9a8573bf79821abc75ccf0fdade19c8a9
author Jakob Bornecrantz <jakob@vmware.com> 1277751549 +0200
committer Jakob Bornecrantz <jakob@vmware.com> 1277752485 +0200

Merge branch 'gallium-drm-driver-drescriptor'

Conflicts:
	src/gallium/state_trackers/egl/x11/native_dri2.c
	src/gallium/state_trackers/egl/x11/native_x11.c
	src/gallium/state_trackers/egl/x11/native_x11.h
	src/gallium/state_trackers/xorg/xorg_driver.c
	src/gallium/winsys/radeon/drm/radeon_drm.c