Merge commit 'v2.6.31-rc9' into tracing/core
commited011b22ce567eabefa9ea571d3721c10ecd0553
authorIngo Molnar <mingo@elte.hu>
Sun, 6 Sep 2009 04:11:38 +0000 (6 06:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 6 Sep 2009 04:11:42 +0000 (6 06:11 +0200)
treec7aee6684613075c772388a99a9137014549434e
parent85bac32c4a52c592b857f2c360cc5ec93a097d70
parente07cccf4046978df10f2e13fe2b99b2f9b3a65db
Merge commit 'v2.6.31-rc9' into tracing/core

Merge reason: move from -rc5 to -rc9.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Documentation/kernel-parameters.txt
arch/x86/Kconfig
include/linux/perf_counter.h
kernel/module.c
kernel/trace/blktrace.c
kernel/trace/ftrace.c
kernel/trace/trace.c
tools/perf/util/parse-events.c