review.tizen.org Git - platform/upstream/libdrm.git/commit

projects / platform / upstream / libdrm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 11aaa35 e172945)

author	Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
	Wed, 18 Oct 2006 15:33:19 +0000 (17:33 +0200)
committer	Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
	Wed, 18 Oct 2006 15:33:19 +0000 (17:33 +0200)
commit	e22b04f807b9869c8c89b6316214517f5da13322
tree	e2bf963e8704a0a9e0ec37a791c119e6e0995ed2	tree \| snapshot
parent	11aaa358a0f56afb64df44c737ec331d90118537	commit \| diff
parent	e172945d668f1de1243ac2ae91ab77f3b2bda40a	commit \| diff

Merging drm-ttm-0-2-branch

Conflicts:

linux-core/drmP.h
linux-core/drm_drv.c
linux-core/drm_irq.c
linux-core/drm_stub.c
shared-core/drm.h
shared-core/i915_drv.h
shared-core/i915_irq.c

libdrm/xf86drm.h	diff1 \|	diff2 \|	blob \| history
linux-core/drmP.h	diff1 \|	diff2 \|	blob \| history
linux-core/drm_bufs.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_irq.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_stub.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_vm.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_irq.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;