Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Fri, 4 Mar 2011 09:40:22 +0000 (10:40 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 4 Mar 2011 09:40:25 +0000 (10:40 +0100)
commit888a8a3e9d79cbb9d83e53955f684998248580ec
tree3dbf548438c77d89c8696a9a79c4129cdc2f3d3e
parentcfff2d909cbdaf8c467bd321aa0502a548ec8f7e
parentb06b3d49699a52e8f9ca056c4f96e81b1987d78e
Merge branch 'perf/urgent' into perf/core

Merge reason: Pick up updates before queueing up dependent patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
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