]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 10 Jan 2022 18:35:41 +0000 (15:35 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 10 Jan 2022 18:35:41 +0000 (15:35 -0300)
To pick up fixes.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1  2 
tools/perf/builtin-trace.c

Simple merge