OSDN Git Service

Merge branch 'master' into modesetting-101
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Mon, 28 Apr 2008 10:10:44 +0000 (12:10 +0200)
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Mon, 28 Apr 2008 10:10:44 +0000 (12:10 +0200)
commit7f269bec7ed49385de394fdbd970f463ef2060f0
tree8c45f8c2e11cf101350272f81892cf4cf7678c3a
parent55a9941977953d16b36bbf3e1dcad392ac70e1ef
parent7f8e4060859651993921281445ec00940c577222
Merge branch 'master' into modesetting-101

Conflicts:

linux-core/Makefile.kernel
linux-core/drm_compat.c
linux-core/drm_fops.c
linux-core/drm_lock.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
24 files changed:
libdrm/xf86drm.c
linux-core/Makefile
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_bo.c
linux-core/drm_bo_move.c
linux-core/drm_compat.c
linux-core/drm_compat.h
linux-core/drm_fops.c
linux-core/drm_irq.c
linux-core/drm_lock.c
linux-core/drm_objects.h
linux-core/i915_buffer.c
linux-core/i915_drv.c
linux-core/i915_execbuf.c
linux-core/i915_fence.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/radeon_drm.h
shared-core/radeon_ms_exec.c