]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8366f0d 5925fa6)
Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 17 Sep 2020 18:45:05 +0000 (15:45 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 17 Sep 2020 18:45:05 +0000 (15:45 -0300)
To pick up fixes.

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

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