Chris Wilson bdd92c9ad2 Merge branch 'drm-intel-fixes' into drm-intel-next ...

Merge important suspend and resume regression fixes and resolve the
small conflict.

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c

2011-01-24 23:45:32 +00:00

..

drm

Merge branch 'drm-intel-fixes' into drm-intel-next

2011-01-24 23:45: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