Dave Airlie c1176d6f03 Merge branch 'drm-next' of ../drm-next into drm-linus ... conflict in radeon since new init path merged with vga arb code. Conflicts: drivers/gpu/drm/radeon/radeon.h drivers/gpu/drm/radeon/radeon_asic.h drivers/gpu/drm/radeon/radeon_device.c		2009-10-08 14:03:05 +10:00
..
drm	Merge branch 'drm-next' of ../drm-next into drm-linus	2009-10-08 14:03:05 +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