]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f51088c c938443)
Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 3 Aug 2020 12:37:31 +0000 (09:37 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 3 Aug 2020 12:37:31 +0000 (09:37 -0300)
commit1b1d296de9d0983cbee9902ec8a88d0480b61b85
tree92ce9158daae144032cc6297ab8fdbad12664247tree | snapshot
parentf51088c3da8dff8fd13ace9fd88bf5d11bd0d7b8commit | diff
parentc9384438eae575d67eebc79b5dc3d28648b56ac3commit | diff
Merge remote-tracking branch 'torvalds/master' into perf/core

Minor conflict in tools/perf/arch/arm/util/auxtrace.c as one fix there
was cherry-picked for the last perf/urgent pull req to Linus, so was
already there.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/lib/traceevent/event-parse.c diff1 | diff2 | blob | history
tools/lib/traceevent/plugins/Makefile diff1 | diff2 | blob | history
Linux Kernel Source Tree.