David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

Signed-off-by: David S. Miller <davem@davemloft.net>

2016-08-18 01:17:32 -04:00

..

blktrace.c

…

bpf_trace.c

…

ftrace.c

…

Kconfig

…

Makefile

…

power-traces.c

…

ring_buffer_benchmark.c

…

ring_buffer.c

…

rpm-traces.c

…

trace_benchmark.c

…

trace_benchmark.h

…

trace_branch.c

…

trace_clock.c

…

trace_entries.h

…

trace_event_perf.c

…

trace_events_filter_test.h

…

trace_events_filter.c

…

trace_events_hist.c

…

trace_events_trigger.c

…

trace_events.c

…

trace_export.c

…

trace_functions_graph.c

…

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

…

trace_probe.c

…

trace_probe.h

…

trace_sched_switch.c

…

trace_sched_wakeup.c

…

trace_selftest_dynamic.c

…

trace_selftest.c

…

trace_seq.c

…

trace_stack.c

…

trace_stat.c

…

trace_stat.h

…

trace_syscalls.c

…

trace_uprobe.c

…

trace.c

…

trace.h

…

tracing_map.c

…

tracing_map.h

…