tree 41ec3db083bdb46cd831f0d39db1fe294ae7d55f
parent fe16d949b45036d9f80e20e07bde1ddacc930b10
parent 452858338aec31c1f4414bf07f31663690479869
author Chris Wilson <chris@chris-wilson.co.uk> 1297848965 +0000
committer Chris Wilson <chris@chris-wilson.co.uk> 1297849470 +0000

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