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

Merge in the conflicting eDP fix.

Conflicts:
	drivers/gpu/drm/i915/i915_irq.c
	drivers/gpu/drm/i915/intel_display.c

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

2011-02-22 16:09:03 +00:00

..

drm

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

2011-02-22 16:09:03 +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

gpu: Add Intel GMA500(Poulsbo) Stub Driver

2010-10-26 11:00:13 +10:00