| commit | bdd92c9ad287e03a2ec52f5a89c470cd5caae1c2 | [log] [tgz] |
|---|---|---|
| author | Chris Wilson <chris@chris-wilson.co.uk> | Sun Jan 23 17:24:26 2011 +0000 |
| committer | Chris Wilson <chris@chris-wilson.co.uk> | Mon Jan 24 23:45:32 2011 +0000 |
| tree | 38d863507e900fb2ccac4c22fcf8934271c051b5 | |
| parent | a37f2f87edc1b6e5932becf6e51535d36b690f2a [diff] | |
| parent | 8e934dbf264418afe4d1dff34ce074ecc14280db [diff] |
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