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
..
drm	Merge remote branch 'anholt/drm-intel-next' into drm-linus	2009-12-08 14:03:47 +10:00
vga	PCI/vgaarb: cleanup some warnings + cleanup some comments.	2009-09-09 13:29:41 -07:00
Makefile	PCI/GPU: implement VGA arbitration on Linux	2009-09-09 13:29:36 -07:00