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)
commitdfacc4d6c98b89609250269f518c1f54c30454ef
treee7effbee7bdc85d18f7b26ab9cb5c9f700d1481a
parentf869097e884d8cb65b2bb7831ca57b7dffb66fdd
parent85cb68b27c428d477169f3aa46c72dba103a17bd
Merge branch 'perf/urgent' of git://git./linux/kernel/git/frederic/random-tracing into perf/core
include/linux/ftrace_event.h
include/trace/ftrace.h
kernel/perf_event.c