diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-22 15:58:46 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-22 16:09:03 +0000 |
| commit | 710f957846cff998c681f3701f6f90eda896458f (patch) | |
| tree | ba22ee7b469dd0cee974019cc32630838691f3af /tools/perf/scripts/python | |
| parent | drm/i915: Add support for limited color range of broadcast outputs (diff) | |
| parent | drm/i915: skip FDI & PCH enabling for DP_A (diff) | |
| download | linux-710f957846cff998c681f3701f6f90eda896458f.tar.gz linux-710f957846cff998c681f3701f6f90eda896458f.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Merge in the conflicting eDP fix.
Conflicts:
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions