| commit | 965b4d662a5236ee5aeb94a70f62565b6ed5644c | [log] [tgz] |
|---|---|---|
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | Thu Nov 13 15:30:06 2008 -0800 |
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | Thu Nov 13 15:30:06 2008 -0800 |
| tree | 7645e5130046e3952c2a490d5561bafe67cbff89 | |
| parent | 9a4cb7eab4f74747cc777a3fef31dbb46e1191e5 [diff] | |
| parent | 7e27b3ba88f0c40680380636a436c18e3220c7ce [diff] |
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