diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-19 15:54:37 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-19 15:54:37 +0100 |
| commit | b80d6c781e7eb16e24c2a04a88ab6b230bcbbb35 (patch) | |
| tree | aeb0885a6a3499ef96b2472be323965db8e1295e /tools/perf/scripts/python/event_analyzing_sample.py | |
| parent | drm/i915: Rename similar plane functions to avoid confusion (diff) | |
| parent | drm/i915/dp: use the new drm helpers for dp i2c-over-aux (diff) | |
| download | linux-b80d6c781e7eb16e24c2a04a88ab6b230bcbbb35.tar.gz linux-b80d6c781e7eb16e24c2a04a88ab6b230bcbbb35.zip | |
Merge branch 'topic/dp-aux-rework' into drm-intel-next-queued
Conflicts:
drivers/gpu/drm/i915/intel_dp.c
A bit a mess with reverts which differe in details between -fixes and
-next and some other unrelated shuffling.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tools/perf/scripts/python/event_analyzing_sample.py')
0 files changed, 0 insertions, 0 deletions