Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit

projects / firefly-linux-kernel-4.4.55.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	d244b6bd41e09ecbb09c738cc2c108be227398c8
tree	848c6a8a0d6f83929daf43d63e241dc8072066ac	tree \| snapshot
parent	da5cabf80e2433131bf0ed8993abc0f7ea618c73	commit \| diff
parent	1aa54bca6ee0d07ebcafb8ca8074b624d80724aa	commit \| diff

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>

Unnamed repository; edit this file 'description' to name the repository.

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