Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@kernel.org>
Sat, 24 Mar 2012 07:19:09 +0000 (08:19 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 24 Mar 2012 07:19:09 +0000 (08:19 +0100)
commit04a54d27ce9698d108d29c8a6a50c28f7446336b
tree95041020d6fd5e283e81f7c12c2fd4433b6af8e5
parentc7206205d00ab375839bd6c7ddb247d600693c09
parent01de982abf8c9e10fc3089e10585cd2cc914bdab
Merge branch 'tip/perf/urgent' of git://git./linux/kernel/git/rostedt/linux-trace into perf/urgent
kernel/trace/trace_entries.h
kernel/trace/trace_export.c