Merge branch 'master' into vblank-rework, fixup remaining drivers
authorJesse Barnes <jesse.barnes@intel.com>
Tue, 30 Oct 2007 19:52:46 +0000 (12:52 -0700)
committerJesse Barnes <jesse.barnes@intel.com>
Tue, 30 Oct 2007 19:52:46 +0000 (12:52 -0700)
commit91aae7e683786a48547872b0a5fa92b2232e02c0
treea30c8022886d61add4a4c2e073fa07f29d7745a7
parent7e9ea55a2f052cc939ba9bbf9edac39798344b7a
parent79744d730c90019edd367eee4a8ec1fa22d53402
Merge branch 'master' into vblank-rework, fixup remaining drivers

Conflicts:

linux-core/drmP.h
linux-core/drm_drv.c
linux-core/drm_irq.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/mga_drv.h
shared-core/mga_irq.c
shared-core/radeon_drv.h
shared-core/radeon_irq.c

Merge in the latest master bits and update the remaining drivers (except
mach64 which math_b is working on).  Also remove the 9xx hack from the i915
driver; it seems to be correct.
20 files changed:
linux-core/drmP.h
linux-core/drm_drv.c
linux-core/drm_irq.c
linux-core/i915_drv.c
linux-core/mga_drv.c
linux-core/r128_drv.c
shared-core/drm.h
shared-core/i915_drv.h
shared-core/i915_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/r128_irq.c
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