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

projects / platform / upstream / libdrm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d5f2b4b b9d9c30)

author	Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
	Thu, 25 Oct 2007 09:00:45 +0000 (11:00 +0200)
committer	Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
	Thu, 25 Oct 2007 09:00:45 +0000 (11:00 +0200)
commit	9adf8c02563b1e6110e46dabd733e2dc440b4200
tree	7a0e360dc9663b3e269a5d5e164672bf8885a5e4	tree \| snapshot
parent	d5f2b4b411c5ca95d6f66a33d213ece387ac4fc5	commit \| diff
parent	b9d9c30474238ac8ba4899a19fe4a97e9376f6c4	commit \| diff

Merge branch 'master' into modesetting-101

Conflicts:

linux-core/Makefile.kernel
linux-core/drm_bo.c
linux-core/drm_objects.h

linux-core/Makefile.kernel	diff1 \|	diff2 \|	blob \| history
linux-core/drm_bo.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_drv.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_objects.h	diff1 \|	diff2 \|	blob \| history
linux-core/drm_stub.c	diff1 \|	diff2 \|	blob \| history
linux-core/i915_buffer.c	diff1 \|	diff2 \|	blob \| history
linux-core/intel_fb.c	diff1 \|	\|	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_init.c	diff1 \|	\|	blob \| history

Domain: System / Kernel;