]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'perf/urgent' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Fri, 25 Aug 2017 09:01:05 +0000 (11:01 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 25 Aug 2017 09:01:05 +0000 (11:01 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
include/asm-generic/vmlinux.lds.h
kernel/events/core.c

Simple merge
Simple merge