git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Steven Rostedt <srostedt@redhat.com>
	Fri, 21 May 2010 15:49:57 +0000 (11:49 -0400)
committer	Steven Rostedt <rostedt@goodmis.org>
	Fri, 21 May 2010 15:49:57 +0000 (11:49 -0400)
commit	ff5f149b6aec8edbfa3698721667acd043009a33
tree	d052553eb296dfee3f01b1cb2b717cb7ccf3127a	tree \| snapshot
parent	f0218b3e9974f06014b61be8987159f4a20e011e	commit \| diff
parent	580d607cd666dfabfc1c7b0fb08c8ac690c7c87f	commit \| diff

Merge branch 'perf/core' of git://git./linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-7

Conflicts:
include/linux/ftrace_event.h
include/trace/ftrace.h
kernel/trace/trace_event_perf.c
kernel/trace/trace_kprobe.c
kernel/trace/trace_syscalls.c

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

John Crispins staging tree

RSS Atom

include/linux/ftrace_event.h	diff1 \|	diff2 \|	blob \| history
include/trace/ftrace.h	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_event_perf.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_kprobe.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_syscalls.c	diff1 \|	diff2 \|	blob \| history