Chris Wilson 8a327f23e2 Merge remote branch 'linus/master' into drm-intel-fixes ... Merge with Linus to resolve conflicting fixes for the reusing the stale HEAD value during intel_ring_wait(). Conflicts: drivers/gpu/drm/i915/intel_ringbuffer.c		2011-01-24 18:27:32 +00:00
..
drm	Merge remote branch 'linus/master' into drm-intel-fixes	2011-01-24 18:27:32 +00:00
stub	ACPI video: remove output switching control	2010-12-14 00:04:52 -05:00
vga	Merge remote branch 'linus/master' into drm-intel-fixes	2011-01-24 18:27:32 +00:00
Makefile	gpu: Add Intel GMA500(Poulsbo) Stub Driver	2010-10-26 11:00:13 +10:00