git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Steven Rostedt <srostedt@redhat.com>
	Mon, 16 Aug 2010 15:17:30 +0000 (11:17 -0400)
committer	Steven Rostedt <rostedt@goodmis.org>
	Mon, 16 Aug 2010 15:17:30 +0000 (11:17 -0400)
commit	22461204ba5da54cf2c94601756340f809f0e184
tree	848c6a8a0d6f83929daf43d63e241dc8072066ac	tree \| snapshot
parent	d1a5ef25f4f4034bef7991998f8f95568eb6224a	commit \| diff
parent	152d18bb11bcc5753cfc71213721ad3046366754	commit \| diff

Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/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>

Linux Kernel Source Tree.

RSS Atom

kernel/trace/ring_buffer.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_events.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_functions_graph.c	diff1 \|	diff2 \|	blob \| history
scripts/recordmcount.pl	diff1 \|	diff2 \|	blob \| history