projects / profile / ivi / libdrm.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c843d47 e7424e4)
Merge commit 'origin/drm-gem' into modesetting-gem
authorJesse Barnes <jbarnes@jbarnes-t61.(none)>
Wed, 18 Jun 2008 22:25:54 +0000 (15:25 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 18 Jun 2008 22:25:54 +0000 (15:25 -0700)
commit86accbcb344ff25fbb47a788bb0f7464b5cd797f
treed023b852e7dab469bcc1d2b7f37493709e657fe5tree | snapshot
parentc843d47b906e57fb3002af4a609d3cb95c5e195dcommit | diff
parente7424e4580159b0ac3e232674dff5c862e851dffcommit | diff
Merge commit 'origin/drm-gem' into modesetting-gem

Lots of conflicts, seems to load ok, but I'm sure some bugs snuck in.

Conflicts:

linux-core/drmP.h
linux-core/drm_lock.c
linux-core/i915_gem.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
16 files changed:
libdrm/xf86drm.c diff1 | diff2 | blob | history
linux-core/Makefile diff1 | diff2 | blob | history
linux-core/drmP.h diff1 | diff2 | blob | history
linux-core/drm_drv.c diff1 | diff2 | blob | history
linux-core/drm_gem.c diff1 | diff2 | blob | history
linux-core/drm_irq.c diff1 | diff2 | blob | history
linux-core/drm_lock.c diff1 | diff2 | blob | history
linux-core/drm_proc.c diff1 | diff2 | blob | history
linux-core/i915_drv.c diff1 | diff2 | blob | history
linux-core/i915_gem.c diff1 | diff2 | blob | history
shared-core/drm.h diff1 | diff2 | 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
Domain: Graphics System / Uncategorized;