]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
projects / thirdparty / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fcdfafc 516fb7f)
Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 13 Nov 2017 12:39:12 +0000 (09:39 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 13 Nov 2017 12:39:12 +0000 (09:39 -0300)
To pick up fixes.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1  2 
tools/perf/builtin-trace.c patch | diff1 | diff2 | blob | history
tools/perf/util/parse-events.l patch | diff1 | diff2 | blob | history

diff --cc tools/perf/builtin-trace.c
Simple merge
diff --cc tools/perf/util/parse-events.l
Simple merge
A mirror of Linus' kernel repository