Ingo Molnar 73e21ce28d Merge branch 'perf/urgent' into perf/core ... Conflicts: arch/x86/kernel/cpu/perf_event_intel.c Merge in the latest fixes before applying new patches, resolve the conflict. Signed-off-by: Ingo Molnar <mingo@kernel.org>		2013-04-21 10:57:33 +02:00
..
callchain.c	perf: Add attribute to filter out callchains	2012-08-10 12:40:57 -03:00
core.c	Merge branch 'perf/urgent' into perf/core	2013-04-21 10:57:33 +02:00
hw_breakpoint.c	perf/hwbp: Fix cleanup in case of kzalloc failure	2013-02-14 17:06:39 -03:00
internal.h	perf: Fix ring_buffer perf_output_space() boundary calculation	2013-03-21 12:04:35 +01:00
Makefile	uprobes: Move to kernel/events/	2012-02-22 11:08:00 +01:00
ring_buffer.c	perf: Fix ring_buffer perf_output_space() boundary calculation	2013-03-21 12:04:35 +01:00
uprobes.c	uretprobes: Remove -ENOSYS as return probes implemented	2013-04-13 15:31:58 +02:00