Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@elte.hu>
Thu, 19 Aug 2010 10:48:09 +0000 (12:48 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 19 Aug 2010 10:48:09 +0000 (12:48 +0200)
commitc8710ad38900153af7a3e6762e99c062cfa46443
treea0c0632274c4eb72f51e99a5861f71cffe65ea60
parent6016ee13db518ab1cd0cbf43fc2ad5712021e338
parent86397dc3ccfc0e17b7550d05eaf15fe91f6498dd
Merge branch 'tip/perf/urgent' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/core
include/linux/perf_event.h
kernel/perf_event.c
kernel/trace/trace_functions_graph.c