Merge branch 'master' into modesetting-101
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Mon, 5 Nov 2007 12:46:06 +0000 (13:46 +0100)
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Mon, 5 Nov 2007 12:46:06 +0000 (13:46 +0100)
commit5ce43a346cb9b2a6f6f31f1f750db75d5628c15b
tree51a60696567d1c93b682435aecbbf5ae24a376b8
parent1b91113957e731d264d1e5d49326597f3b78e96f
parent427cc561b3dfbd504472e284e5fc16b63acd1816
Merge branch 'master' into modesetting-101

Conflicts:

linux-core/drm_bufs.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
24 files changed:
linux-core/Makefile.kernel
linux-core/ati_pcigart.c
linux-core/drmP.h
linux-core/drm_bo.c
linux-core/drm_bo_move.c
linux-core/drm_bufs.c
linux-core/drm_compat.h
linux-core/drm_drv.c
linux-core/drm_fops.c
linux-core/drm_objects.h
linux-core/drm_stub.c
linux-core/i915_buffer.c
linux-core/i915_drv.c
linux-core/i915_fence.c
linux-core/radeon_drv.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drm.h
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/i915_mem.c
shared-core/radeon_cp.c
shared-core/radeon_drm.h
shared-core/radeon_drv.h