Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
authorAlan Hourihane <alanh@tungstengraphics.com>
Wed, 28 May 2008 20:01:18 +0000 (21:01 +0100)
committerAlan Hourihane <alanh@tungstengraphics.com>
Wed, 28 May 2008 20:01:18 +0000 (21:01 +0100)
commit3a3f39d144c47ce937d6924d344a9ad3d82a2db5
tree109faf867b2e5774d54fe9499dbfebd3f26f014f
parent070755af3fecefb6b09e8ef98738e4926e4148a7
parent5b86823fa36513f521412a38c240cb18f02dcc9a
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101

Conflicts:

shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/drm_pciids.txt
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/radeon_drm.h
shared-core/radeon_state.c