Ingo Molnar 7fd52392c5 Merge branch 'linus' into perf/urgent ...

Merge reason: we need to fix a non-trivial merge conflict.

Signed-off-by: Ingo Molnar <[email protected]>

2012-03-26 17:19:03 +02: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 'linus' into perf/urgent

2012-03-26 17:19:03 +02:00

hw_breakpoint.c

perf: Disable PERF_SAMPLE_BRANCH_* when not supported

2012-03-05 14:55:42 +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