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)
commite9805de5c736f899dea5220ab8b521cc69c9eca6
tree98d888143f2809e15891d7408b84d5c4bba86398
parentc07dd80269fad45fdad61de0a43fe3d15cd1a119
parentc20370e0969e41bbf735daf932e37ac5ec959213
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101

Conflicts:

shared-core/i915_dma.c