git.stricted.de - GitHub/exynos8895/android_kernel_samsung_universal8895.git/commit

projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8141d00 f5284e7)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 8 Apr 2010 11:36:36 +0000 (13:36 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 8 Apr 2010 11:37:18 +0000 (13:37 +0200)
commit	ca7e0c612005937a4a5a75d3fed90459993de65c
tree	b574fc0f0189b52ffc87ba20c418228db556faa1	tree \| snapshot (tar.gz zip)
parent	8141d0050d76e5695011b5ab577ec66fb51a998c	commit \| diff
parent	f5284e7635787224dda1a2bf82a4c56b1c75671f	commit \| diff

Merge branch 'linus' into perf/core

Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c

Merge reason: pick up latest fixes, fix the conflict

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event_intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event_intel_ds.c	diff1 \|	\|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_selftest.c	diff1 \|	diff2 \|	blob \| history