Merge branch 'linus' into perfcounters/core
Ingo Molnar [Sat, 19 Sep 2009 09:27:32 +0000 (11:27 +0200)]
Merge reason: Bring in tracing changes we depend on.

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

1  2 
arch/x86/kernel/cpu/perf_counter.c
kernel/perf_counter.c
kernel/sched_fair.c

Simple merge
Simple merge
Simple merge