Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorIngo Molnar <mingo@elte.hu>
Thu, 20 May 2010 12:38:55 +0000 (14:38 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 20 May 2010 12:38:55 +0000 (14:38 +0200)
1  2 
include/linux/ftrace_event.h
include/trace/ftrace.h
kernel/perf_event.c

Simple merge
Simple merge
Simple merge