Kristian Høgsberg, the creator of AIGLX, has announced on the X.Org mailing list
that he is beginning to merge his new DRI2 components. This work includes the new DRI2 module, glxdri2 to GLX, and DRM/Mesa patches. The DRI2 work is ready for early adopters, but is able to safely reside next to XF86DRI. With an Intel DDX patch in the intel-batchbuffer git branch, the xf86-video-intel driver will have a DRI2 option to manually enable the DRI2 module.
DRI2 is the new DRI (Direct Rendering Infrastructure) design that was originally drafted at the X Developer Summit (XDS) last year. One of the requirements for DRI2 is the use of the TTM memory manager. More technical information is available on the X.Org Wiki
. More information on the DRI2 merger plans can be read in Kristian's message