Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@elte.hu>
Wed, 21 Jul 2010 19:43:03 +0000 (21:43 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 21 Jul 2010 19:43:06 +0000 (21:43 +0200)
commit9dcdbf7a33d9018ac5d45debcf261be648bdd56a
treebbcc1a018f11ff76cd7ce174ef3ffe2c02da07ee
parentcc5edb0eb9ce892b530e34a5d110382483587942
parentcd5b8f8755a89a57fc8c408d284b8b613f090345
Merge branch 'linus' into perf/core

Merge reason: Pick up the latest perf fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
MAINTAINERS
Makefile
arch/powerpc/kernel/perf_event.c
arch/sparc/kernel/perf_event.c
arch/x86/kernel/kprobes.c
include/linux/syscalls.h
tools/perf/builtin-report.c
tools/perf/util/callchain.c
tools/perf/util/callchain.h