git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6d7aa9d b419148)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 4 Nov 2009 10:54:15 +0000 (11:54 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 4 Nov 2009 10:59:45 +0000 (11:59 +0100)
commit	a2e71271535fde493c32803b1f34789f97efcb5e
tree	90d7139bea2f49e947f27af92614fa6eca50b64d	tree \| snapshot (tar.gz zip)
parent	6d7aa9d721c8c640066142fd9534afcdf68d7f9d	commit \| diff
parent	b419148e567728f6af0c3b01965c1cc141e3e13a	commit \| diff

Merge commit 'v2.6.32-rc6' into perf/core

Conflicts:
tools/perf/Makefile

Merge reason: Resolve the conflict, merge to upstream and merge in
perf fixes so we can add a dependent patch.

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

include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/ftrace.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/ring_buffer.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
tools/perf/Makefile	diff1 \|	diff2 \|	blob \| history
tools/perf/util/symbol.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/symbol.h	diff1 \|	diff2 \|	blob \| history