Merge remote branch 'origin/master' into modesetting-101
authorDave Airlie <airlied@redhat.com>
Fri, 25 Jan 2008 05:27:53 +0000 (15:27 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 25 Jan 2008 05:27:53 +0000 (15:27 +1000)
commite7a41d7f5be49241480a20eb733262712e0f8dcb
tree801c7eadf769db981dfb8a900a24ef48542958a6
parentfb9ea12438de95a6ac085879e079055eaea3daf8
parentbfdddd218ec3e7ce3f8e765b93af35661a7bf0fd
Merge remote branch 'origin/master' into modesetting-101

Conflicts:

linux-core/drm_bo.c
linux-core/drm_drv.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/radeon_irq.c
29 files changed:
libdrm/xf86drm.c
linux-core/ati_pcigart.c
linux-core/drmP.h
linux-core/drm_agpsupport.c
linux-core/drm_bo.c
linux-core/drm_bo_move.c
linux-core/drm_drv.c
linux-core/drm_object.c
linux-core/drm_objects.h
linux-core/drm_vm.c
linux-core/i810_dma.c
linux-core/i915_buffer.c
linux-core/i915_drv.c
linux-core/radeon_buffer.c
linux-core/radeon_drv.c
linux-core/radeon_ms_drv.c
shared-core/drm.h
shared-core/drm_pciids.txt
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_drv.h
shared-core/radeon_irq.c
shared-core/radeon_ms.h
shared-core/radeon_ms_bo.c
shared-core/radeon_ms_drm.c