Merge branch 'linus' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Sat, 19 Sep 2009 09:27:32 +0000 (11:27 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 19 Sep 2009 09:28:41 +0000 (11:28 +0200)
commit929bf0d0156562ce631728b6fa53d68004d456d2
tree739063990a8077b29ef97e69d73bce94573daae4
parentdef0a9b2573e00ab0b486cb5382625203ab4c4a6
parent202c4675c55ddf6b443c7e057d2dff6b42ef71aa
Merge branch 'linus' into perfcounters/core

Merge reason: Bring in tracing changes we depend on.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/perf_counter.c
kernel/perf_counter.c
kernel/sched_fair.c