David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
blktrace.c	convert a bunch of open-coded instances of memdup_user_nul()	2016-01-04 10:26:58 -05:00
bpf_trace.c	bpf: introduce BPF_MAP_TYPE_STACK_TRACE	2016-02-20 00:21:44 -05:00
ftrace.c	ftrace/module: remove ftrace module notifier	2016-02-17 22:14:06 +01:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-11-10 18:11:41 -08:00
Makefile
power-traces.c
ring_buffer_benchmark.c
ring_buffer.c	ring-buffer: Process commits whenever moving to a new page.	2015-11-25 15:24:05 -05:00
rpm-traces.c
trace_benchmark.c
trace_benchmark.h
trace_branch.c
trace_clock.c
trace_entries.h
trace_event_perf.c	Not much new with tracing for this release. Mostly just clean ups and	2016-01-12 20:04:15 -08:00
trace_events_filter_test.h
trace_events_filter.c
trace_events_trigger.c	Not much new with tracing for this release. Mostly just clean ups and	2016-01-12 20:04:15 -08:00
trace_events.c	kernel/*: switch to memdup_user_nul()	2016-01-04 10:27:55 -05:00
trace_export.c
trace_functions_graph.c	tracing: Remove unused ftrace_cpu_disabled per cpu variable	2015-11-07 13:25:14 -05:00
trace_functions.c
trace_irqsoff.c
trace_kdb.c
trace_kprobe.c
trace_mmiotrace.c
trace_nop.c
trace_output.c
trace_output.h
trace_printk.c	tracing: Fix setting of start_index in find_next()	2016-01-04 15:22:47 -05:00
trace_probe.c
trace_probe.h
trace_sched_switch.c
trace_sched_wakeup.c	Most of the changes are clean ups and small fixes. Some of them have	2015-11-06 13:30:20 -08:00
trace_selftest_dynamic.c
trace_selftest.c
trace_seq.c
trace_stack.c	tracing/stacktrace: Show entire trace if passed in function not found	2016-01-29 12:19:10 -05:00
trace_stat.c
trace_stat.h
trace_syscalls.c
trace_uprobe.c
trace.c	tracing: Fix stacktrace skip depth in trace_buffer_unlock_commit_regs()	2016-01-14 09:28:19 -05:00
trace.h	tracing: Fix comment to use tracing_on over tracing_enable	2015-12-23 14:27:25 -05:00