summaryrefslogtreecommitdiff
path: root/tools/perf/python
ModeNameSize
-rwxr-xr-xtracepoint.py1465logplain
-rwxr-xr-xtwatch.py2726logplain
='/cgit.cgi/linux/net-next.git/commit/?id=cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941'>cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff)
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches based on more recent version of the tree.
Diffstat