Dave Airlie 1bd049fa89 Merge branch 'drm-core-next' into drm-linus ... Bring all core drm changes into 2.6.32 tree and resolve the conflict that occurs. Conflicts: drivers/gpu/drm/drm_fb_helper.c		2009-12-08 13:52:41 +10:00
..
drm	Merge branch 'drm-core-next' into drm-linus	2009-12-08 13:52:41 +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