Dave Airlie f846761853 Merge remote branch 'origin/drm-core-next' into test ... Conflicts: drivers/gpu/drm/drm_fb_helper.c		2009-12-08 07:03:55 +10:00
..
drm	Merge remote branch 'origin/drm-core-next' into test	2009-12-08 07:03:55 +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