aboutsummaryrefslogtreecommitdiff
path: root/tools/perf/scripts/python
diff options
context:
space:
mode:
authorSean Paul <[email protected]>2017-07-26 18:39:07 -0400
committerSean Paul <[email protected]>2017-07-26 18:39:07 -0400
commit78acea381d6eb1c67b155e7e2638ba3b1728eb07 (patch)
tree323b89e2f43f5f177223aeb61a6a18fe12eda011 /tools/perf/scripts/python
parent67022227ffb1f588e70deeccc9246ec93e26f980 (diff)
parente6742e1021a5cec55fab50a0b115c65217488eda (diff)
Merge airlied/drm-next into drm-misc-next
Backmerge drm-next with -rc2 in it to pull in a couple stm patches that were previously incorrectly applied to -misc-next. By picking them up in the correct manner, git will hopefully fix any errant trees that are out in the wild. Signed-off-by: Sean Paul <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions