git.stricted.de - GitHub/LineageOS/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9dde9dc ddf6e0e)

author	Ingo Molnar <mingo@elte.hu>
	Tue, 6 Dec 2011 05:42:35 +0000 (06:42 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 6 Dec 2011 05:43:49 +0000 (06:43 +0100)
commit	d6c1c49de577fa292af2449817364b7d89b574d8
tree	e97cf88a318f50eb23c18d790e8b0bcf7bb47169	tree \| snapshot (tar.gz zip)
parent	9dde9dc0a81c7aeb863b35121d09011f09b4897c	commit \| diff
parent	ddf6e0e50723b62ac76ed18eb53e9417c6eefba7	commit \| diff

Merge branch 'perf/urgent' into perf/core

Merge reason: Add these cherry-picked commits so that future changes
on perf/core don't conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
kernel/events/internal.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_events_filter.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/evsel.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/hist.h	diff1 \|	diff2 \|	blob \| history
tools/perf/util/session.c	diff1 \|	diff2 \|	blob \| history