Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
authorAlan Hourihane <alanh@fairlite.demon.co.uk>
Fri, 18 May 2007 12:48:56 +0000 (13:48 +0100)
committerAlan Hourihane <alanh@fairlite.demon.co.uk>
Fri, 18 May 2007 12:48:56 +0000 (13:48 +0100)
commit315cf14af814da60285adb95238181de430c6f68
tree0474fc6591ffb1d4c76c3feb1f34df9ab6286eac
parent95945bbf226610ba4f41381fd0436722082397ec
parentea98d7e79657469545b865a353784d79fc8cff9d
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101

Conflicts:

shared-core/i915_dma.c
linux-core/drmP.h
linux-core/drm_bo.c
linux-core/drm_drv.c
linux-core/drm_objects.h
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_irq.c