Merge branch 'master' into modesetting-gem
authorJesse Barnes <jbarnes@virtuousgeek.org>
Thu, 13 Nov 2008 23:30:06 +0000 (15:30 -0800)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Thu, 13 Nov 2008 23:30:06 +0000 (15:30 -0800)
commit965b4d662a5236ee5aeb94a70f62565b6ed5644c
tree7645e5130046e3952c2a490d5561bafe67cbff89
parent9a4cb7eab4f74747cc777a3fef31dbb46e1191e5
parent7e27b3ba88f0c40680380636a436c18e3220c7ce
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
12 files changed:
configure.ac
libdrm/intel/intel_bufmgr.h
libdrm/intel/intel_bufmgr_fake.c
libdrm/intel/intel_bufmgr_gem.c
linux-core/drm_compat.h
shared-core/drm.h
shared-core/drm_pciids.txt
shared-core/i915_dma.c
shared-core/i915_drm.h
shared-core/i915_irq.c
shared-core/radeon_cp.c
shared-core/radeon_drv.h