| commit | 58e10eb92d36a62568349d985c9140d9be16a99c | [log] [tgz] |
|---|---|---|
| author | Chris Wilson <chris@chris-wilson.co.uk> | Sun Oct 03 10:56:11 2010 +0100 |
| committer | Chris Wilson <chris@chris-wilson.co.uk> | Sun Oct 03 10:56:11 2010 +0100 |
| tree | 6ffaf65e64db390f6a28c1dca8c43d4eb1493f94 | |
| parent | 1cdf7fef793c715d8c4998575aba3741fa4a0b01 [diff] | |
| parent | ab7ad7f6451580aa7eccc0ba62807c872088a8f9 [diff] |
Merge branch 'drm-intel-fixes' into drm-intel-next Conflicts: drivers/gpu/drm/i915/i915_gem_evict.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_dp.c