projects / platform / upstream / libdrm.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f894587 d42c1de)
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into...
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Fri, 18 May 2007 16:42:51 +0000 (09:42 -0700)
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Fri, 18 May 2007 16:42:51 +0000 (09:42 -0700)
commita4929b921e44dcd3cae8e384b9b7eabc51db28ff
tree876a2ba492fd2786ed44ff26c514a0f2951f9096tree | snapshot
parentf89458722173b364b8c3c27788b6c61889da554ccommit | diff
parentd42c1de3fb05405820b03ec9bb12f0b9a7eb0a7bcommit | 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: System / Kernel;