projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7c43b0c bcf8768)
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)
commitb1aa3db2c13ec0c63a73bd8fc5dfbfb112e3ff56
tree92ce9158daae144032cc6297ab8fdbad12664247tree | snapshot
parent7c43b0c1d499c790cdb5623d27fdcef544ddb566commit | diff
parentbcf876870b95592b52519ed4aafcf9d95999bc9ccommit | 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
MicroBlaze GIT Repository