Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Tue, 6 Nov 2007 09:01:52 +0000 (10:01 +0100)
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Tue, 6 Nov 2007 09:01:52 +0000 (10:01 +0100)
commitc07dd80269fad45fdad61de0a43fe3d15cd1a119
tree1701583cb628c170c4945fa0dad63aef742a0ca1
parent5ce43a346cb9b2a6f6f31f1f750db75d5628c15b
parent40fb079aebae4277813e6a32e2e93c81dc0038e3
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101

Conflicts:

linux-core/Makefile.kernel
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
linux-core/Makefile.kernel
linux-core/drm_bo.c
linux-core/i915_buffer.c
linux-core/i915_fence.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c