Jesse Barnes 965b4d662a Merge branch 'master' into modesetting-gem ... Conflicts: libdrm/Makefile.am libdrm/intel/intel_bufmgr.h libdrm/intel/intel_bufmgr_fake.c libdrm/intel/intel_bufmgr_gem.c shared-core/drm.h shared-core/i915_dma.c shared-core/i915_irq.c shared-core/radeon_cp.c shared-core/radeon_drv.h		2008-11-13 15:30:06 -08:00
..
intel_bufmgr.c	intel: Rename dri_ and intel_ symbols to drm_intel_.	2008-10-30 11:29:40 -07:00
intel_bufmgr.h	Merge branch 'master' into modesetting-gem	2008-11-13 15:30:06 -08:00
intel_bufmgr_fake.c	Merge branch 'master' into modesetting-gem	2008-11-13 15:30:06 -08:00
intel_bufmgr_gem.c	Merge branch 'master' into modesetting-gem	2008-11-13 15:30:06 -08:00
intel_bufmgr_priv.h	intel: Rename dri_ and intel_ symbols to drm_intel_.	2008-10-30 11:29:40 -07:00
Makefile.am	link libdrm_intel properly	2008-10-17 06:40:38 +10:00
mm.c	Move the renaming of mm.c symbols to #defines in the header.	2008-06-11 15:58:33 -07:00
mm.h	Move the renaming of mm.c symbols to #defines in the header.	2008-06-11 15:58:33 -07:00