aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/scripts/python
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-10-28 09:14:08 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-10-28 09:14:08 +0200
commit96583ddbec291929880edefa2141c06c63e16aa5 (patch)
tree6ae6bd3aec381d7461a687e3314bdf949798c554 /tools/perf/scripts/python
parentdrm/i915: Correct pipe fault reporting string (diff)
parentMerge branch 'linux-4.9' of git://github.com/skeggsb/linux into drm-next (diff)
downloadlinux-96583ddbec291929880edefa2141c06c63e16aa5.tar.gz
linux-96583ddbec291929880edefa2141c06c63e16aa5.zip
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge latest drm-next to pull in the s/fence/dma_fence/ rework, needed before we merge more i915 fencing patches. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions