OSDN Git Service

(root) / android-x86 / external-libdrm.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5052e96 ccbaad5)
Merge commit 'origin/drm-gem' into modesetting-gem
authorKristian Høgsberg <krh@redhat.com>
Fri, 1 Aug 2008 17:35:56 +0000 (13:35 -0400)
committerKristian Høgsberg <krh@redhat.com>
Fri, 1 Aug 2008 17:35:56 +0000 (13:35 -0400)
commit086716c8e2516dd71e94ebda03e20943188a5e5e
tree860462e19e868694f0e8838bc7418cc69fab0391tree | snapshot
parent5052e966ec7fe5146c2d73b90482003619add5dacommit | diff
parentccbaad52f79162a77d98d0dde00681b1dbf14165commit | diff
Merge commit 'origin/drm-gem' into modesetting-gem

Conflicts:
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_mm.c
linux-core/drm_stub.c
linux-core/i915_gem.c
linux-core/i915_opregion.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
20 files changed:
linux-core/Makefile.kernel diff1 | diff2 | blob | history
linux-core/drmP.h diff1 | diff2 | blob | history
linux-core/drm_bo.c diff1 | diff2 | blob | history
linux-core/drm_bo_move.c diff1 | diff2 | blob | history
linux-core/drm_drv.c diff1 | diff2 | blob | history
linux-core/drm_mm.c diff1 | diff2 | blob | history
linux-core/drm_objects.h diff1 | diff2 | blob | history
linux-core/drm_proc.c diff1 | diff2 | blob | history
linux-core/drm_stub.c diff1 | diff2 | blob | history
linux-core/i915_drv.c diff1 | diff2 | blob | history
linux-core/i915_gem.c diff1 | diff2 | blob | history
linux-core/i915_gem_proc.c | diff2 | blob | history
linux-core/i915_gem_tiling.c | diff2 | blob | history
linux-core/i915_opregion.c diff1 | diff2 | blob | history
linux-core/radeon_buffer.c diff1 | | blob | history
shared-core/i915_dma.c diff1 | diff2 | blob | history
shared-core/i915_drm.h diff1 | diff2 | blob | history
shared-core/i915_drv.h diff1 | diff2 | blob | history
shared-core/i915_init.c diff1 | | blob | history
shared-core/i915_irq.c diff1 | diff2 | blob | history
external/libdrm
About OSDN
Find Software
Develop Software
Help