David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts net/sched/cls_bpf.c Two simple sets of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-27 16:59:56 -08:00
..
events	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
define_trace.h
ftrace.h	tracing: Fix return value of ftrace_raw_output_prep()	2014-11-19 15:25:48 -05:00
syscall.h	tracing: Fix syscall_*regfunc() vs copy_process() race	2014-06-21 00:15:12 -04:00