]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 344dd70 4906d92)
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Mon, 5 Mar 2012 08:20:08 +0000 (09:20 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 5 Mar 2012 08:20:08 +0000 (09:20 +0100)
commit9cf9b67f11c173c10439f4c47ea16f009b8eb7a0
tree35495fff3e9956679cb5468e74e6814c8e44ee66tree | snapshot
parent344dd70728ecea81943fae9c4362bd60fba58acecommit | diff
parent4906d923d3d980ad7edea2e64dddc9d768734237commit | diff
Merge branch 'perf/urgent' into perf/core

Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/perf.h
tools/perf/util/top.h

Merge reason: resolve these cherry-picking conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
16 files changed:
arch/powerpc/kernel/perf_event.c diff1 | diff2 | blob | history
arch/x86/include/asm/perf_event.h diff1 | diff2 | blob | history
arch/x86/kernel/cpu/perf_event.c diff1 | diff2 | blob | history
arch/x86/kernel/cpu/perf_event.h diff1 | diff2 | blob | history
fs/exec.c diff1 | diff2 | blob | history
include/trace/events/sched.h diff1 | diff2 | blob | history
kernel/events/core.c diff1 | diff2 | blob | history
kernel/events/hw_breakpoint.c diff1 | diff2 | blob | history
kernel/irq/chip.c diff1 | diff2 | blob | history
kernel/sched/core.c diff1 | diff2 | blob | history
kernel/sched/fair.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/sock.c diff1 | diff2 | blob | history
tools/perf/util/evlist.c diff1 | diff2 | blob | history
tools/perf/util/probe-event.c diff1 | diff2 | blob | history
tools/perf/util/probe-finder.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.