summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/ftrace_32.S
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2019-11-26 17:06:19 +0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2019-11-26 17:06:19 +0300
commit2ea352d5960ad469f5712cf3e293db97beac4e01 (patch)
treec24ae19073f2884867b310ee193d36a82075b60f /arch/x86/kernel/ftrace_32.S
parentceb9e77324fa661b1001a0ae66f061b5fcb4e4e6 (diff)
parentbe2eca94d144e3ffed565c483a58ecc76a869c98 (diff)
downloadlinux-2ea352d5960ad469f5712cf3e293db97beac4e01.tar.xz
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up BPF changes we'll need. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/x86/kernel/ftrace_32.S')
0 files changed, 0 insertions, 0 deletions