OSDN Git Service

Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
authorAlan Hourihane <alanh@tungstengraphics.com>
Tue, 16 Oct 2007 14:28:33 +0000 (15:28 +0100)
committerAlan Hourihane <alanh@tungstengraphics.com>
Tue, 16 Oct 2007 14:28:33 +0000 (15:28 +0100)
commit90bfc8e611cb0c72ee03dce47027b50d2cc614b1
tree3fdcec3cf166b6fc4f5a6aeb8e46b277bd49a8bf
parent2b07b0a45d32a9ffb7f6b9bb1b8f6f8e615524cb
parentdb1709f2f3f8cab2477fb149b58420de4db65654
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101

Conflicts:

linux-core/drm_bo.c
linux-core/drm_objects.h
shared-core/i915_dma.c
shared-core/i915_drv.h
15 files changed:
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_bo.c
linux-core/drm_bo_move.c
linux-core/drm_compat.h
linux-core/drm_drv.c
linux-core/drm_fops.c
linux-core/drm_objects.h
linux-core/i915_buffer.c
linux-core/i915_fence.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