aboutsummaryrefslogtreecommitdiff
path: root/tools/perf/scripts/python/bin
diff options
context:
space:
mode:
authorDaniel Vetter <[email protected]>2017-03-08 10:54:45 +0100
committerDaniel Vetter <[email protected]>2017-03-08 10:54:45 +0100
commit7ffe939dd9c71e149f31817394b70b52b4067304 (patch)
treed779769f1477be9b9976699d6778a45edd001e4a /tools/perf/scripts/python/bin
parent7c55e2c5772dcf3cbacd0fa2bcfeefae416b73f7 (diff)
parent6796b129b0e98162a84e0b6322ac28587556d427 (diff)
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge drm-next to get at all the good stuff in drm-misc. We need that because: - drm_connector_list_iter conversion for i915 needs the core patches. - Maarten's patches to use the new atomic state iterators also need the core patches. - We need the new link status property to complete the DP retraining work, merging through 2 branches wasn't a good idea and we had to partially backtrack. - Chris needs reservation_object_trylock and we want to roll out kref_read everywhere. Signed-off-by: Daniel Vetter <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/bin')
0 files changed, 0 insertions, 0 deletions