Merge commit 'v2.6.33' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Fri, 26 Feb 2010 08:18:32 +0000 (09:18 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 26 Feb 2010 08:18:32 +0000 (09:18 +0100)
commit64b9fb5704a479d98a59f2a1d45d3331a8f847f8
tree2b1052b05fa7615c817894bc9802bc5bb2af7ac1
parent83f0d53993b2967e54186468b0fc4321447f68f1
parent60b341b778cc2929df16c0a504c91621b3c6a4ad
Merge commit 'v2.6.33' into tracing/core

Conflicts:
scripts/recordmcount.pl

Merge reason: Merge up to v2.6.33.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/ftrace.c
kernel/trace/trace.c
kernel/trace/trace_kprobe.c
scripts/recordmcount.pl