Merge branch 'linus' into perfcounters/core

Merge reason: Bring in tracing changes we depend on.

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

diff --cc arch/x86/kernel/cpu/perf_counter.c
Simple merge

diff --cc kernel/perf_counter.c
Simple merge

diff --cc kernel/sched_fair.c
Simple merge