| commit | 3619df035ec9280314fae44032a6167f16ec38d2 | [log] [tgz] |
|---|---|---|
| author | Chris Wilson <chris@chris-wilson.co.uk> | Sun Nov 28 15:37:17 2010 +0000 |
| committer | Chris Wilson <chris@chris-wilson.co.uk> | Sun Nov 28 15:37:17 2010 +0000 |
| tree | 7b486292be5fe083701fec52d96faec0f9775ace | |
| parent | 602606a472963a67b234e6b5c99293de4aa9d06b [diff] | |
| parent | de18a29e0fa3904894b4e02fae0e712cd43f740c [diff] |
Merge branch 'drm-intel-fixes' into drm-intel-next Conflicts: drivers/gpu/drm/i915/i915_gem.c