Merge branch 'perf/urgent' into perf/core, to pick up fixes

author Ingo Molnar <[email protected]>

Fri, 25 Aug 2017 09:01:05 +0000 (11:01 +0200)

committer Ingo Molnar <[email protected]>

Fri, 25 Aug 2017 09:01:05 +0000 (11:01 +0200)
author Ingo Molnar <[email protected]>
Fri, 25 Aug 2017 09:01:05 +0000 (11:01 +0200)
committer Ingo Molnar <[email protected]>
Fri, 25 Aug 2017 09:01:05 +0000 (11:01 +0200)
diff --cc include/asm-generic/vmlinux.lds.h
Simple merge
diff --cc kernel/events/core.c
Simple merge
author	Ingo Molnar <[email protected]>
	Fri, 25 Aug 2017 09:01:05 +0000 (11:01 +0200)
committer	Ingo Molnar <[email protected]>
	Fri, 25 Aug 2017 09:01:05 +0000 (11:01 +0200)
		1	2
include/asm-generic/vmlinux.lds.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	patch \|	diff1 \|	diff2 \|	blob \| history