]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'perf/powerpc' and 'perf/bench' into perf/core
authorIngo Molnar <mingo@elte.hu>
Sun, 15 Nov 2009 08:51:19 +0000 (09:51 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 15 Nov 2009 08:51:24 +0000 (09:51 +0100)
commita194ba963d6f726c3d6dcce23f814b72e8fe7c6d
treea9e25ba4431de513d4c83201429e9ff301cbaf50
parent9667c3f5be88d5508ac68e2f6a90c99c69fa21eb
parentcf3f4e7e219240e3f488d792b828b3cb3641583d
parentdd83e30e4444ed2e37624500d4876b24e0e39c4a
Merge branches 'perf/powerpc' and 'perf/bench' into perf/core

Merge reason: Both 'perf bench' and the pending PowerPC changes
              are now ready for the next merge window.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/perf_event.c
arch/powerpc/kernel/time.c
include/linux/perf_counter.h
include/linux/perf_event.h
kernel/perf_event.c
tools/perf/Makefile
tools/perf/perf.c
tools/perf/util/parse-events.c