git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a30b85d 275d34b)

author	Ingo Molnar <mingo@kernel.org>
	Fri, 20 Oct 2017 09:02:05 +0000 (11:02 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Fri, 20 Oct 2017 09:02:05 +0000 (11:02 +0200)
commit	ca4b9c3b743da39a6e0756a5c68edb35f6fc5e53
tree	95ce0819f92e25bc4d768ab13cee1f385a83a7b2	tree \| snapshot
parent	a30b85df7d599f626973e9cd3056fe755bd778e0	commit \| diff
parent	275d34b82561e695339b782950d49c386169dae3	commit \| diff

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

Signed-off-by: Ingo Molnar <mingo@kernel.org>

12 files changed:

arch/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/events/intel/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/kprobes/common.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/kprobes/core.c	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
tools/perf/Documentation/perf-record.txt	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-script.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/parse-events.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/parse-events.l	diff1 \|	diff2 \|	blob \| history
tools/perf/util/pmu.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/pmu.h	diff1 \|	diff2 \|	blob \| history
tools/perf/util/session.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git