| commit | 9035a97a32836d0e456ddafaaf249a844e6e4b5e | [log] [tgz] |
|---|---|---|
| author | Chris Wilson <chris@chris-wilson.co.uk> | Wed Feb 16 09:36:05 2011 +0000 |
| committer | Chris Wilson <chris@chris-wilson.co.uk> | Wed Feb 16 09:44:30 2011 +0000 |
| tree | 41ec3db083bdb46cd831f0d39db1fe294ae7d55f | |
| parent | fe16d949b45036d9f80e20e07bde1ddacc930b10 [diff] | |
| parent | 452858338aec31c1f4414bf07f31663690479869 [diff] |
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