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

projects / platform / upstream / libdrm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 81db485 a6a2f2c)

author	Dave Airlie <airlied@panoply-rh.(none)>
	Wed, 5 Mar 2008 00:37:02 +0000 (10:37 +1000)
committer	Dave Airlie <airlied@panoply-rh.(none)>
	Wed, 5 Mar 2008 00:37:02 +0000 (10:37 +1000)
commit	43891ff2d0176f013796b3c2a340b7d379d703ee
tree	734cdcd6e6c36997f1db92d41b92e4557ebf13b1	tree \| snapshot
parent	81db48536c9d7bb23c448af6a6f1de81df755585	commit \| diff
parent	a6a2f2c8c491617de702dc7d62bb55cbada4d42b	commit \| diff

Merge remote branch 'origin/master' into modesetting-101

Conflicts:

linux-core/drm_compat.c

libdrm/xf86drm.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_agpsupport.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_bo_move.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_compat.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_compat.h	diff1 \|	diff2 \|	blob \| history
linux-core/drm_objects.h	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;