]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorSteven Rostedt <srostedt@redhat.com>
Mon, 16 Aug 2010 15:17:30 +0000 (11:17 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Mon, 16 Aug 2010 15:17:30 +0000 (11:17 -0400)
commitd244b6bd41e09ecbb09c738cc2c108be227398c8
tree848c6a8a0d6f83929daf43d63e241dc8072066ac
parentda5cabf80e2433131bf0ed8993abc0f7ea618c73
parent1aa54bca6ee0d07ebcafb8ca8074b624d80724aa
Merge branch 'tip/perf/urgent-3' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into trace/tip/perf/urgent-4

Conflicts:
kernel/trace/trace_events.c

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
kernel/trace/ring_buffer.c
kernel/trace/trace.c
kernel/trace/trace_events.c
kernel/trace/trace_functions_graph.c
scripts/recordmcount.pl