Merge commit 'v2.6.31-rc9' into tracing/core
Ingo Molnar [Sun, 6 Sep 2009 04:11:38 +0000 (06:11 +0200)]
Merge reason: move from -rc5 to -rc9.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
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

Simple merge
Simple merge
Simple merge
diff --cc kernel/module.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge