OSDN Git Service

Merge commit 'origin/drm-gem' into modesetting-gem
authorJesse Barnes <jbarnes@hobbes.lan>
Wed, 11 Jun 2008 00:31:54 +0000 (17:31 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 11 Jun 2008 00:31:54 +0000 (17:31 -0700)
commita1d96007241a78dd2b4a718df8e0568fe7994c22
treeb7a4bfaa77ddf957a6ade0c47d91e14a45b91659
parentc987e76d953b6aecbfb69058fc4c387aa3fb33c9
parent500c81d194115fb3c4b97d742519689478eeb4e8
Merge commit 'origin/drm-gem' into modesetting-gem

Passed the compile test; it's ready to ship.

Conflicts:

libdrm/Makefile.am
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_memrange.c
linux-core/drm_stub.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
24 files changed:
libdrm/Makefile.am
libdrm/xf86drm.c
libdrm/xf86drm.h
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_drv.c
linux-core/drm_fops.c
linux-core/drm_irq.c
linux-core/drm_lock.c
linux-core/drm_memrange.c
linux-core/drm_objects.h
linux-core/drm_proc.c
linux-core/drm_stub.c
linux-core/i915_drv.c
linux-core/i915_gem.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drm.h
shared-core/i915_drv.h
shared-core/i915_init.c
shared-core/i915_irq.c