Merge branch 'perf/urgent' into perf/core
Ingo Molnar [Fri, 4 Mar 2011 09:40:22 +0000 (10:40 +0100)]
Merge reason: Pick up updates before queueing up dependent patches.

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

1  2 
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event_intel.c
include/linux/sched.h
tools/perf/builtin-timechart.c
tools/perf/util/symbol.c

Simple merge
Simple merge
Simple merge
Simple merge