review.tizen.org Git - profile/ivi/libdrm.git/commit

projects / profile / ivi / libdrm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f894587 d42c1de)

author	Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
	Fri, 18 May 2007 16:42:51 +0000 (09:42 -0700)
committer	Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
	Fri, 18 May 2007 16:42:51 +0000 (09:42 -0700)
commit	a4929b921e44dcd3cae8e384b9b7eabc51db28ff
tree	876a2ba492fd2786ed44ff26c514a0f2951f9096	tree \| snapshot
parent	f89458722173b364b8c3c27788b6c61889da554c	commit \| diff
parent	d42c1de3fb05405820b03ec9bb12f0b9a7eb0a7b	commit \| diff

Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101

Conflicts:

linux-core/drm_crtc.c - reconcile with locking changes

linux-core/drm_crtc.c	diff1 \|	diff2 \|	blob \| history
linux-core/drm_crtc.h	diff1 \|	diff2 \|	blob \| history
linux-core/drm_fb.c	diff1 \|	diff2 \|	blob \| history
linux-core/intel_fb.c	diff1 \|	diff2 \|	blob \| history

Domain: Graphics System / Uncategorized;