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

projects / platform / upstream / libdrm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f99dea7 cfa21b2)

author	Dave Airlie <airlied@linux.ie>
	Tue, 11 Dec 2007 06:58:00 +0000 (16:58 +1000)
committer	Dave Airlie <airlied@linux.ie>
	Tue, 11 Dec 2007 06:58:00 +0000 (16:58 +1000)
commit	8d2da202337300e821f4867cb2654b41ff6053b6
tree	c7b0c4644c99180081eaa3f2e4bf0d1b4f8bbd63	tree \| snapshot
parent	f99dea7db00dd46aa96eaed3a61dff9c956fd86f	commit \| diff
parent	cfa21b22b43c7113107b5eb086b5f4d4ec36dc0a	commit \| diff

Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101

Conflicts:

linux-core/drm_drv.c
shared-core/drm.h
shared-core/i915_dma.c

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

Domain: System / Kernel;