Merge branch 'perf/fast' into perf/core
authorIngo Molnar <mingo@elte.hu>
Fri, 27 Jan 2012 11:07:57 +0000 (12:07 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 27 Jan 2012 11:08:09 +0000 (12:08 +0100)
Merge reason: Lets ready it for v3.4

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/arm/include/asm/perf_event.h
kernel/events/core.c
tools/perf/builtin-test.c

Simple merge
Simple merge
Simple merge