Ingo Molnar 2a3ede8cb2 Merge branch 'perf/urgent' into perf/core to fix conflicts ...

Conflicts:
	tools/perf/bench/numa.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2013-11-04 07:49:35 +01:00

..

callchain.c

perf: Roll back callchain buffer refcount under the callchain mutex

2013-08-16 17:55:50 +02:00

core.c

perf: Fix the perf context switch optimization

2013-10-29 14:13:01 +01:00

hw_breakpoint.c

hw_breakpoint: Introduce "struct bp_cpuinfo"

2013-06-20 17:58:57 +02:00

internal.h

perf: Fix mmap() accounting hole

2013-06-19 12:44:13 +02:00

Makefile

uprobes: Move to kernel/events/

2012-02-22 11:08:00 +01:00

ring_buffer.c

perf: Fix perf ring buffer memory ordering

2013-10-29 12:01:19 +01:00

uprobes.c

uprobes: Teach uprobe_copy_process() to handle CLONE_VFORK

2013-10-29 18:02:55 +01:00