Merge remote branch 'anholt/drm-intel-next' into drm-linus
authorDave Airlie <airlied@redhat.com>
Tue, 8 Dec 2009 04:03:47 +0000 (14:03 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 8 Dec 2009 04:03:47 +0000 (14:03 +1000)
commit3ff99164f67aae78a2bd2313f65ad55bddb1ffea
treed6bba03616d1be6ab9e6d9e92641a6f4047e1e15
parent1bd049fa895f9c6743f38b52ce14775f5a31ea63
parentf2b115e69d46344ae7afcaad5823496d2a0d8650
Merge remote branch 'anholt/drm-intel-next' into drm-linus

This merges the upstream Intel tree and fixes up numerous conflicts
due to patches merged into Linus tree later in -rc cycle.

Conflicts:
drivers/char/agp/intel-agp.c
drivers/gpu/drm/drm_dp_i2c_helper.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_suspend.c
14 files changed:
drivers/char/agp/intel-agp.c
drivers/gpu/drm/drm_crtc.c
drivers/gpu/drm/drm_dp_i2c_helper.c
drivers/gpu/drm/i915/Makefile
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_crt.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
include/drm/drm.h
include/drm/drmP.h
include/drm/drm_crtc.h
include/drm/i915_drm.h