Dave Airlie 3ff99164f6 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

2009-12-08 14:03:47 +10:00

24 KiB

Raw Blame History

View Raw