Merge commit 'v2.6.33' into tracing/core
Ingo Molnar [Fri, 26 Feb 2010 08:18:32 +0000 (09:18 +0100)]
Conflicts:
scripts/recordmcount.pl

Merge reason: Merge up to v2.6.33.

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

1  2 
kernel/trace/ftrace.c
kernel/trace/trace.c
kernel/trace/trace_kprobe.c
scripts/recordmcount.pl

Simple merge
Simple merge
Simple merge
Simple merge