Chris Wilson 47ae63e0c2 Merge branch 'drm-intel-fixes' into drm-intel-next ... Apply the trivial conflicting regression fixes, but keep GPU semaphores enabled. Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_execbuffer.c		2011-03-07 12:35:15 +00:00
..
drm	Merge branch 'drm-intel-fixes' into drm-intel-next	2011-03-07 12:35:15 +00:00
stub	gpu/stub: fix acpi_video build error, fix stub kconfig dependencies	2011-02-04 12:48:18 +10:00
vga	Merge remote branch 'linus/master' into drm-intel-fixes	2011-01-24 18:27:32 +00:00
Makefile