]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit98ff3d54fdb250fae112af8b934dc275b765778a
tree406ce0543fa294d41ab8204ca531ab18453e5a1a
parenta356fc8c1eb046d14172cac636390c8642b46b34
parent59b35dfb18be643a84117749aa126b96eecb6a3d
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