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

projects / platform / upstream / libdrm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f78cdac 1257459)

author	Dave Airlie <airlied@linux.ie>
	Wed, 5 Mar 2008 19:26:23 +0000 (05:26 +1000)
committer	Dave Airlie <airlied@linux.ie>
	Wed, 5 Mar 2008 19:26:23 +0000 (05:26 +1000)
commit	e00dea812ddb9b483de9f58f7a7aa7105427512d
tree	9ffef663b16a3c444ea9a294d635be4e81e6fe99	tree \| snapshot
parent	f78cdac8e512642db1aaf09bf9178e23ede25586	commit \| diff
parent	12574590cdf7871755d1939463ca6898251fd0d1	commit \| diff

Merge branch 'master' of ../../drm into modesetting-101

Conflicts:

linux-core/drmP.h
linux-core/drm_drv.c
linux-core/drm_proc.c
linux-core/drm_stub.c
linux-core/drm_sysfs.c

linux-core/drmP.h	diff1 \|	diff2 \|	blob \| history
linux-core/drm_bo.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_objects.h	diff1 \|	diff2 \|	blob \| history
linux-core/drm_stub.c	diff1 \|	diff2 \|	blob \| history
shared-core/i915_dma.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;