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

projects / platform / upstream / libdrm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 50bce2b 6e8a2cf)

author	Eric Anholt <eric@anholt.net>
	Fri, 30 May 2008 21:42:08 +0000 (14:42 -0700)
committer	Eric Anholt <eric@anholt.net>
	Fri, 30 May 2008 21:42:08 +0000 (14:42 -0700)
commit	461bfa3da6f85b85c21cd84f81bb4eefa5481418
tree	33e91c8cd024f67922670f9ed6565ceda1e4f3b5	tree \| snapshot
parent	50bce2bc625deb439dd61f504496dddd0cd4f572	commit \| diff
parent	6e8a2cff66ac0d6afaf9bb233bc81449c2014078	commit \| diff

Merge commit 'origin/master' into drm-gem

Conflicts:

linux-core/Makefile.kernel
shared-core/i915_drv.h
shared-core/nouveau_state.c

linux-core/Makefile.kernel	diff1 \|	diff2 \|	blob \| history
linux-core/drm_fops.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_lock.c	diff1 \|	diff2 \|	blob \| history
linux-core/i915_drv.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_drv.h	diff1 \|	diff2 \|	blob \| history
shared-core/i915_irq.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;