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

projects / platform / upstream / libdrm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7fd8a5d d250a55)

author	Kristian Høgsberg <krh@redhat.com>
	Mon, 7 Jul 2008 19:43:43 +0000 (15:43 -0400)
committer	Kristian Høgsberg <krh@redhat.com>
	Mon, 7 Jul 2008 19:43:43 +0000 (15:43 -0400)
commit	3e02f7fd310ae062d250d8db01ddc3b7de3d7943
tree	cfce44b02b989ad9d7bf2a497e49743e15d77168	tree \| snapshot
parent	7fd8a5de63781f6faa053509c80e02e8f1cdbb69	commit \| diff
parent	d250a55fc6a726a8bfaf4f871eeb09c895a9ba51	commit \| diff

Merge commit 'origin/drm-gem' into ms-gem

Conflicts:

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

linux-core/drmP.h	diff1 \|	diff2 \|	blob \| history
linux-core/drm_compat.h	diff1 \|	diff2 \|	blob \| history
linux-core/drm_drv.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
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_irq.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;