David S. Miller 909b27f706 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next' because we no longer have a per-netns conntrack hash. The ip_gre.c conflict as well as the iwlwifi ones were cases of overlapping changes. Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/tx.c net/ipv4/ip_gre.c net/netfilter/nf_conntrack_core.c Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-15 13:32:48 -04:00
..
callchain.c	perf: generalize perf_callchain	2016-02-20 00:21:44 -05:00
core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-15 13:32:48 -04:00
hw_breakpoint.c	perf: Collapse and fix event_function_call() users	2016-01-21 18:54:24 +01:00
internal.h	perf: generalize perf_callchain	2016-02-20 00:21:44 -05:00
Makefile	ftrace: allow architectures to specify ftrace compile options	2015-01-29 09:19:19 +01:00
ring_buffer.c	perf/core: Disable the event on a truncated AUX record	2016-05-12 14:46:11 +02:00
uprobes.c	mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros	2016-04-04 10:41:08 -07:00