Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh the tree
authorIngo Molnar <mingo@kernel.org>
Fri, 27 Mar 2015 08:46:03 +0000 (09:46 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 27 Mar 2015 08:46:03 +0000 (09:46 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/events/core.c
tools/perf/util/annotate.c

Simple merge
Simple merge