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

projects / platform / upstream / libdrm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7f04dd0 2a618e5)

author	Alan Hourihane <alanh@tungstengraphics.com>
	Wed, 12 Mar 2008 10:18:33 +0000 (10:18 +0000)
committer	Alan Hourihane <alanh@tungstengraphics.com>
	Wed, 12 Mar 2008 10:18:33 +0000 (10:18 +0000)
commit	b6dc381fabb199e70dc681e44e31452af8536313
tree	9b25b1a427cba3d3e35d4272e53a482038142242	tree \| snapshot
parent	7f04dd06e6003dd492ae5ddc876121a686f49157	commit \| diff
parent	2a618e5a7f6d26fe85e7d931d0ef08d9f18b1b7c	commit \| diff

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

Conflicts:

shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c

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_proc.c	diff1 \|	diff2 \|	blob \| history
shared-core/i915_dma.c	diff1 \|	diff2 \|	blob \| history
shared-core/i915_drv.h	diff1 \|	diff2 \|	blob \| history
shared-core/i915_irq.c	diff1 \|	diff2 \|	blob \| history
shared-core/radeon_state.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;