Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 27 Jan 2021 19:48:04 +0000 (16:48 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 27 Jan 2021 19:48:04 +0000 (16:48 -0300)
To pick up fixes.

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

Simple merge