]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc927793dcf0274bd39bf4c91b2c75285c9cdafc9
tree3dbf548438c77d89c8696a9a79c4129cdc2f3d3e
parent1b5e1708c37ec183e00c763815a23f993fa9470c
parent149270d3c6b9c11a6b766f2c543c22888206c78f
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