Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
authorAlan Hourihane <alanh@tungstengraphics.com>
Mon, 18 Feb 2008 22:35:46 +0000 (22:35 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Mon, 18 Feb 2008 22:35:46 +0000 (22:35 +0000)
commitf24ed2ad6c66e50268fd175146a1661ae4bbd350
treedf804321f182607e8183df3375a16807ff42ba85
parent2b1c9cd696049d23845870329d2b61a5873f7b13
parent5d8c754bc2c720d70bbdeca6b294660105717a62
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101

Conflicts:

linux-core/i915_fence.c
linux-core/via_fence.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
13 files changed:
linux-core/drmP.h
linux-core/drm_bo.c
linux-core/drm_fence.c
linux-core/drm_irq.c
linux-core/drm_objects.h
linux-core/i915_drv.c
linux-core/via_fence.c
shared-core/drm_pciids.txt
shared-core/i915_dma.c
shared-core/i915_drm.h
shared-core/i915_drv.h
shared-core/radeon_cp.c
shared-core/radeon_drv.h