Chris Wilson e9e5f8e8d3 Merge branch 'drm-intel-fixes' into HEAD ... Conflicts: drivers/char/agp/intel-agp.c drivers/gpu/drm/i915/intel_crt.c		2010-09-21 11:19:32 +01:00
..
drm	Merge branch 'drm-intel-fixes' into HEAD	2010-09-21 11:19:32 +01:00
vga	vgaarb: use MIT license	2010-06-03 13:13:34 +10:00
Makefile	PCI/GPU: implement VGA arbitration on Linux	2009-09-09 13:29:36 -07:00