Merge branch 'radeon-gem-cs' into modesetting-gem
authorDave Airlie <airlied@redhat.com>
Wed, 13 Aug 2008 23:36:34 +0000 (09:36 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 13 Aug 2008 23:36:34 +0000 (09:36 +1000)
commit2d4420c6669dbaead27346b8c7e1979edc94ae5a
tree134fcbc1e4b902f7e1918d32c991bf2923da2101
parent1c6abcefdc37f5cbb447e8fee1f3805fd7d19bea
parent2a65759d159478b126c660ef124777548dcc872c
Merge branch 'radeon-gem-cs' into modesetting-gem

Conflicts:

libdrm/xf86drm.c
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_compat.h
linux-core/drm_drv.c
linux-core/drm_stub.c
linux-core/drm_vm.c
shared-core/i915_dma.c
shared-core/r300_cmdbuf.c
shared-core/radeon_drv.h
20 files changed:
libdrm/intel/intel_bufmgr_fake.c
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_bo.c
linux-core/drm_drv.c
linux-core/drm_memory.c
linux-core/drm_objects.h
linux-core/drm_stub.c
linux-core/drm_vm.c
linux-core/radeon_buffer.c
linux-core/radeon_reg.h
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drm.h
shared-core/i915_init.c
shared-core/r300_cmdbuf.c
shared-core/r300_reg.h
shared-core/radeon_cp.c
shared-core/radeon_cs.c
shared-core/radeon_drv.h