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

projects / platform / upstream / libdrm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9b9a127 694e1c5)

author	Dave Airlie <airlied@linux.ie>
	Wed, 11 Jul 2007 01:23:41 +0000 (11:23 +1000)
committer	Dave Airlie <airlied@linux.ie>
	Wed, 11 Jul 2007 01:23:41 +0000 (11:23 +1000)
commit	2c9e05cf4c6eb18c941321f764ed1b282a314ba9
tree	d5bcbe9114fac7e03549ae05a9e6dffc793fcbaf	tree \| snapshot
parent	9b9a127ed0fe9a6a8e2fde84739ccff6fa0bc5ac	commit \| diff
parent	694e1c5c3f768436651ddf95e11ab5a89ccc8ffa	commit \| diff

Merge branch 'master' into cleanup

Conflicts:

libdrm/xf86drm.c
linux-core/drm_bo.c
linux-core/drm_fence.c

libdrm/xf86drm.c	diff1 \|	diff2 \|	blob \| history
libdrm/xf86mm.h	diff1 \|	diff2 \|	blob \| history
linux-core/drm_bo.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_compat.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_drv.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_fence.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_objects.h	diff1 \|	diff2 \|	blob \| history
shared-core/i915_drv.h	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;