Merge branches 'perf/powerpc' and 'perf/bench' into perf/core
commit0ffa798d947f5f5e40690cc9d38e678080a34f87
authorIngo Molnar <mingo@elte.hu>
Sun, 15 Nov 2009 08:51:19 +0000 (15 09:51 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 15 Nov 2009 08:51:24 +0000 (15 09:51 +0100)
treea9e25ba4431de513d4c83201429e9ff301cbaf50
parent39dc78b6510323848e3356452f7dab9499736978
parentc86e2eaded39843e1bf4f07d1adfab4494f20894
parentc5659b74f052150791750234f92dcfb29d27efa5
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