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

projects / platform / upstream / libdrm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 085df64 b0e6882)

author	Jesse Barnes <jbarnes@virtuousgeek.org>
	Wed, 13 Aug 2008 17:08:02 +0000 (10:08 -0700)
committer	Jesse Barnes <jbarnes@virtuousgeek.org>
	Wed, 13 Aug 2008 17:08:02 +0000 (10:08 -0700)
commit	2f03ba4aad1718a36168550b6a146b79540252e6
tree	7bc55a8948f00c60ad2354171dd345e35e6ff741	tree \| snapshot
parent	085df6491e4975681a6e17ff9a67d01268aa7553	commit \| diff
parent	b0e68829462aad00ce68be998da6313bca754e9a	commit \| diff

Merge branch 'master' into modesetting-gem

Conflicts:

libdrm/Makefile.am
libdrm/xf86drm.h
shared-core/i915_dma.c
shared-core/i915_irq.c

libdrm/Makefile.am	diff1 \|	diff2 \|	blob \| history
libdrm/dri_bufmgr.h	diff1 \|	diff2 \|	blob \| history
libdrm/intel/intel_bufmgr_gem.c	diff1 \|	diff2 \|	blob \| history
libdrm/xf86drm.c	diff1 \|	diff2 \|	blob \| history
libdrm/xf86drm.h	diff1 \|	diff2 \|	blob \| history
linux-core/Makefile	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_gem.c	diff1 \|	diff2 \|	blob \| history
shared-core/i915_irq.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;