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

projects / platform / upstream / libdrm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 487c42b 514c05c)

author	Eric Anholt <eric@anholt.net>
	Mon, 28 Jul 2008 22:17:21 +0000 (15:17 -0700)
committer	Eric Anholt <eric@anholt.net>
	Tue, 29 Jul 2008 06:12:26 +0000 (23:12 -0700)
commit	1d2bb68d28fe39746299ee8ddb664a62de839b0c
tree	f1f89d0ea693a0520f4e856296c4d3d4d721501f	tree \| snapshot
parent	487c42bd42d93304278abce03b36c935bdc83284	commit \| diff
parent	514c05cebe31a62f827a76f348d35596bef97811	commit \| diff

Merge commit 'origin/master' into drm-gem

Conflicts:

linux-core/Makefile.kernel
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c

16 files changed:

linux-core/Makefile.kernel	diff1 \|	diff2 \|	blob \| history
linux-core/drmP.h	diff1 \|	diff2 \|	blob \| history
linux-core/drm_agpsupport.c	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_irq.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_lock.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_memory.c	diff1 \|	diff2 \|	blob \| history
linux-core/i915_drv.c	diff1 \|	diff2 \|	blob \| history
linux-core/i915_gem.c	diff1 \|	\|	blob \| history
linux-core/i915_gem_proc.c	diff1 \|	\|	blob \| history
linux-core/i915_opregion.c	\|	diff2 \|	blob \| history
shared-core/drm.h	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

Domain: System / Kernel;