Merge branch 'perf/stat' into perf/core
authorIngo Molnar <mingo@elte.hu>
Fri, 6 May 2011 19:07:33 +0000 (21:07 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 6 May 2011 19:07:38 +0000 (21:07 +0200)
Merge reason: the perf stat improvements are tested and ready now.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/kernel/cpu/perf_event_intel.c
include/linux/perf_event.h

Simple merge