projects / platform / upstream / libdrm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c07dd80 c20370e)
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Wed, 7 Nov 2007 17:10:46 +0000 (18:10 +0100)
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Wed, 7 Nov 2007 17:10:46 +0000 (18:10 +0100)
Conflicts:

shared-core/i915_dma.c


Trivial merge
Domain: System / Kernel;