Merge remote branch 'anholt/drm-intel-next' into drm-linus
authorDave Airlie <airlied@redhat.com>
Thu, 10 Dec 2009 05:44:11 +0000 (15:44 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 10 Dec 2009 05:44:19 +0000 (15:44 +1000)
commit0b5e8db639de032bd4febbb0a5b1cd2c19bac26d
treeeddc436f8cbf85cea5205f7dc118bf0068c2d127
parent7b0a9e8302522d5f7bb7fab6b8a3c8ce8181609c
parent4f8d619cc3ab805aa1726c1dfe196a0705b955bd
Merge remote branch 'anholt/drm-intel-next' into drm-linus

Pull more Intel changes in, especially one to init the GTT properly
drivers/char/agp/intel-agp.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_suspend.c
drivers/gpu/drm/i915/intel_display.c