]> www.infradead.org Git - nvme.git/commitdiff
projects / nvme.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47fddcb 45dfb8a)
Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 20 Jan 2021 17:35:31 +0000 (14:35 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 20 Jan 2021 17:35:31 +0000 (14:35 -0300)
To pick up fixes.

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

diff --cc tools/perf/util/machine.c
Simple merge
diff --cc tools/perf/util/session.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.