Ingo Molnar 737f24bda7 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>		2012-03-05 09:20:08 +01:00
..
callchain.c	perf: Don't call release_callchain_buffers() if allocation fails	2012-01-21 09:33:41 +01:00
core.c	Merge branch 'perf/urgent' into perf/core	2012-03-05 09:20:08 +01:00
hw_breakpoint.c	Merge branch 'perf/urgent' into perf/core	2012-03-05 09:20:08 +01:00
internal.h	Merge branch 'perf/urgent' into perf/core	2011-12-06 06:43:49 +01:00
Makefile	perf: Carve out callchain functionality	2011-11-14 13:31:26 +01:00
ring_buffer.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-01-08 13:21:22 -08:00