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)
commit57d524154ffe99d27fb55e0e30ddbad9f4c35806
tree406ce0543fa294d41ab8204ca531ab18453e5a1a
parente04d1b23f9706186187dcb0be1a752e48dcc540b
parentc63ca0c01d73563d4e2ab174bb3dd1e5efb907e6
Merge branch 'perf/stat' into perf/core

Merge reason: the perf stat improvements are tested and ready now.

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