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: 75ec5a2 8bb39f9)

author	Ingo Molnar <mingo@elte.hu>
	Fri, 2 Apr 2010 17:37:50 +0000 (19:37 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 2 Apr 2010 17:38:10 +0000 (19:38 +0200)
commit	ec5e61aabeac58670691bd0613388d16697d0d81
tree	59838509358f27334874b90756505785cde29b02	tree \| snapshot (tar.gz zip)
parent	75ec5a245c7763c397f31ec8964d0a46c54a7386	commit \| diff
parent	8bb39f9aa068262732fe44b965d7a6eb5a5a7d67	commit \| diff

Merge branch 'perf/urgent' into perf/core

Conflicts:
arch/x86/kernel/cpu/perf_event.c

Merge reason: Resolve the conflict, pick up fixes

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/msr-index.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event_amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history