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)
1  2 
include/linux/perf_event.h
kernel/perf_event.c
kernel/trace/trace_functions_graph.c

Simple merge
Simple merge
Simple merge