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

Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.

Conflicts:
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/i915_irq.c

2011-02-16 09:44:30 +00:00

32 KiB

Raw Blame History

View Raw