Merge branch 'master' into vblank-rework, including mach64 support
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Tue, 22 Jan 2008 17:42:37 +0000 (09:42 -0800)
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Tue, 22 Jan 2008 17:42:37 +0000 (09:42 -0800)
commit0cd4cbc9a6330bd619608f274592082de7c05bcf
tree4e0b682a24e448d17abf8b2fadc75ccee2cd5b57
parent128a8f7ea20af2549e448157b431d5c1f90f37c3
parent5231a524f53babd127a576d7567671dafb29651b
Merge branch 'master' into vblank-rework, including mach64 support

Conflicts:

linux-core/drmP.h
linux-core/drm_drv.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/mga_irq.c
shared-core/radeon_irq.c
shared-core/via_irq.c

Mostly trivial conflicts.

mach64 support from Mathieu BĂ©rard.
22 files changed:
linux-core/drmP.h
linux-core/drm_drv.c
linux-core/drm_irq.c
linux-core/i915_drv.c
linux-core/mach64_drv.c
linux-core/mga_drv.c
linux-core/radeon_drv.c
shared-core/drm.h
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/mach64_drv.h
shared-core/mach64_irq.c
shared-core/mga_drv.h
shared-core/mga_irq.c
shared-core/nouveau_drv.h
shared-core/nouveau_irq.c
shared-core/r128_drv.h
shared-core/radeon_drv.h
shared-core/radeon_irq.c
shared-core/via_drv.c
shared-core/via_drv.h
shared-core/via_irq.c